diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 17:53:56 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 17:53:56 +0100 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /arch/arm/mach-ixp4xx/nas100d-setup.c | |
| parent | Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | [PATCH] powerpc: Fix bug in bug fix for bug in lmb_alloc() (diff) | |
| download | linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.xz linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c index 856d56f3b2ae..a3b4c6ac5708 100644 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -113,6 +113,9 @@ static void __init nas100d_init(void) { ixp4xx_sys_init(); + /* gpio 14 and 15 are _not_ clocks */ + *IXP4XX_GPIO_GPCLKR = 0; + nas100d_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); nas100d_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; |