diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
| commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
| tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-ks8695/board-acs5k.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-ks8695/board-acs5k.c')
| -rw-r--r-- | arch/arm/mach-ks8695/board-acs5k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c index 3ca4f8e6f54f..a5fcc7c7fe18 100644 --- a/arch/arm/mach-ks8695/board-acs5k.c +++ b/arch/arm/mach-ks8695/board-acs5k.c | |||
| @@ -223,7 +223,7 @@ static void __init acs5k_init(void) | |||
| 223 | 223 | ||
| 224 | MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board") | 224 | MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board") |
| 225 | /* Maintainer: Simtec Electronics. */ | 225 | /* Maintainer: Simtec Electronics. */ |
| 226 | .boot_params = KS8695_SDRAM_PA + 0x100, | 226 | .atag_offset = 0x100, |
| 227 | .map_io = ks8695_map_io, | 227 | .map_io = ks8695_map_io, |
| 228 | .init_irq = ks8695_init_irq, | 228 | .init_irq = ks8695_init_irq, |
| 229 | .init_machine = acs5k_init, | 229 | .init_machine = acs5k_init, |