summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-gta02.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-15 16:19:05 +0100
committerArnd Bergmann <arnd@arndb.de>2012-03-15 16:20:07 +0100
commitf4e2467bad53023589cbff18dd1ab6e0aa3f004c (patch)
tree8d7abbf418eabd25bbcdc9b6de2f8216d2eaa616 /arch/arm/mach-s3c24xx/mach-gta02.c
parentMerge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linu... (diff)
parentep93xx: Remove unnecessary includes of ep93xx-regs.h (diff)
downloadlinux-f4e2467bad53023589cbff18dd1ab6e0aa3f004c.tar.xz
linux-f4e2467bad53023589cbff18dd1ab6e0aa3f004c.zip
Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup
* 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6: ep93xx: Remove unnecessary includes of ep93xx-regs.h ep93xx: Move EP93XX_SYSCON defines to SoC private header ep93xx: Move crunch code to mach-ep93xx directory ep93xx: Make syscon access functions private to SoC ep93xx: Configure GPIO ports in core code ep93xx: Move peripheral defines to local SoC header ep93xx: Convert the watchdog driver into a platform device. ep93xx: Use ioremap for backlight driver ep93xx: Move GPIO defines to gpio-ep93xx.h ep93xx: Don't use system controller defines in audio drivers ep93xx: Move PHYS_BASE defines to local SoC header file (update to v3.3-rc7) Conflicts: arch/arm/mach-s3c2440/common.h
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-gta02.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-gta02.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
index d0e0ad4e6598..ba5d85394105 100644
--- a/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@ -601,5 +601,5 @@ MACHINE_START(NEO1973_GTA02, "GTA02")
.init_irq = s3c24xx_init_irq,
.init_machine = gta02_machine_init,
.timer = &s3c24xx_timer,
- .restart = s3c2440_restart,
+ .restart = s3c244x_restart,
MACHINE_END