diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 20:50:16 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 20:50:16 +0000 |
commit | 4788d72ce6c0d71220c06a242f935a056eccf424 (patch) | |
tree | 851ba5c54b4889b78b2a217c285e87c9e73536d3 /arch/arm/mach-s3c2440/common.h | |
parent | e594a97c8c74533ec105b2ac9194217e918f172f (diff) | |
parent | d39c815278bef7ce896100d8b385c81ed5cac015 (diff) | |
download | op-kernel-dev-4788d72ce6c0d71220c06a242f935a056eccf424.zip op-kernel-dev-4788d72ce6c0d71220c06a242f935a056eccf424.tar.gz |
Merge branch 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (201 commits)
gpio/samsung: use ioremap() for EXYNOS4 GPIOlib
gpio/samsung: add support GPIOlib for EXYNOS5250
ARM: EXYNOS: add support GPIO for EXYNOS5250
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
The dummy clock for the pxa rtc in those files keeps getting added and
removed in various trees. Apparently removing is the correct solution.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c2440/common.h')
-rw-r--r-- | arch/arm/mach-s3c2440/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/common.h b/arch/arm/mach-s3c2440/common.h index db8a98a..0c1eb1d 100644 --- a/arch/arm/mach-s3c2440/common.h +++ b/arch/arm/mach-s3c2440/common.h @@ -12,6 +12,6 @@ #ifndef __ARCH_ARM_MACH_S3C2440_COMMON_H #define __ARCH_ARM_MACH_S3C2440_COMMON_H -void s3c2440_restart(char mode, const char *cmd); +void s3c244x_restart(char mode, const char *cmd); #endif /* __ARCH_ARM_MACH_S3C2440_COMMON_H */ |