diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 11:11:56 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 11:11:56 -0500 |
| commit | 4c75aab698d4b7cc08f3a5dd329fc7e9af3d0e3c (patch) | |
| tree | 03a2be42314c424863b96553537bf24d6b03a211 /arch/arm/mach-s3c2440/mach-anubis.c | |
| parent | 1dbd02ec389b11ffc6288695e13c5754e6e07847 (diff) | |
| parent | 63f32b3893aba641504d744d58ab5ed6f528fc7c (diff) | |
Merge branch 'v3.3-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.3-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: fix touchscreen IRQ setup on Universal C210 board
ARM: S3C24XX: DMA resume regression fix
ARM: S3C24XX: Fix restart on S3C2442
ARM: SAMSUNG: Fix memory size for hsotg
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-anubis.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index 24569550de1a..19b577bc09b8 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
| @@ -487,5 +487,5 @@ MACHINE_START(ANUBIS, "Simtec-Anubis") | |||
| 487 | .init_machine = anubis_init, | 487 | .init_machine = anubis_init, |
| 488 | .init_irq = s3c24xx_init_irq, | 488 | .init_irq = s3c24xx_init_irq, |
| 489 | .timer = &s3c24xx_timer, | 489 | .timer = &s3c24xx_timer, |
| 490 | .restart = s3c2440_restart, | 490 | .restart = s3c244x_restart, |
| 491 | MACHINE_END | 491 | MACHINE_END |