diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 14:34:05 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 16:50:56 +0200 |
| commit | 0dc488e778069b208d09516c5f0793dc37023c8e (patch) | |
| tree | 704ad7fa4d8202f1933297e4dd348128a2b9f702 /drivers/rtc/rtc-s3c.c | |
| parent | c4c54da24b8ae12abb2034edaf08021894caf0d0 (diff) | |
| parent | bd51de53e1be9896d815bbea30560262216d4616 (diff) | |
| download | olio-linux-3.10-0dc488e778069b208d09516c5f0793dc37023c8e.tar.xz olio-linux-3.10-0dc488e778069b208d09516c5f0793dc37023c8e.zip | |
Merge branch 'samsung/exynos-multiplatform' into next/drivers
Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/rtc/rtc-s3c.c')
| -rw-r--r-- | drivers/rtc/rtc-s3c.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index fb994e9ddc1..7995f79d07e 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -29,9 +29,8 @@ #include <linux/uaccess.h> #include <linux/io.h> -#include <mach/hardware.h> #include <asm/irq.h> -#include <plat/regs-rtc.h> +#include "rtc-s3c.h" enum s3c_cpu_type { TYPE_S3C2410, |