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-ep93xx/ts72xx.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-ep93xx/ts72xx.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index c2d2cf40ead9..1ade3c340507 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
| @@ -257,7 +257,7 @@ static void __init ts72xx_init_machine(void) | |||
| 257 | 257 | ||
| 258 | MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") | 258 | MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") |
| 259 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 259 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 260 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 260 | .atag_offset = 0x100, |
| 261 | .map_io = ts72xx_map_io, | 261 | .map_io = ts72xx_map_io, |
| 262 | .init_irq = ep93xx_init_irq, | 262 | .init_irq = ep93xx_init_irq, |
| 263 | .timer = &ep93xx_timer, | 263 | .timer = &ep93xx_timer, |