diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 12:09:17 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 12:09:21 -0400 |
| commit | 065319c229c76ded943a8a7cf55e1e6e1e55ae69 (patch) | |
| tree | 6b16c74b13eb2d8147aa346aa0dec247a8cd0a28 /arch/arm/mach-s3c2440/mach-at2440evb.c | |
| parent | c77ef898625f558c89c6ca0b27e2032f0fad4196 (diff) | |
| parent | 63ecf0a9b55ada8c59ac10472c4468b46cf2e97a (diff) | |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
* 'board-specific' of git://github.com/hzhuang1/linux:
pxa/hx4700: Remove pcmcia platform_device structure
ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
ARM: pxa/hx4700: Remove unwanted request for GPIO105
(update to 3.3-rc7)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-at2440evb.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-at2440evb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index d6a9763110cd..d7ae49c90118 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
| @@ -222,5 +222,5 @@ MACHINE_START(AT2440EVB, "AT2440EVB") | |||
| 222 | .init_machine = at2440evb_init, | 222 | .init_machine = at2440evb_init, |
| 223 | .init_irq = s3c24xx_init_irq, | 223 | .init_irq = s3c24xx_init_irq, |
| 224 | .timer = &s3c24xx_timer, | 224 | .timer = &s3c24xx_timer, |
| 225 | .restart = s3c2440_restart, | 225 | .restart = s3c244x_restart, |
| 226 | MACHINE_END | 226 | MACHINE_END |