diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 20:19:14 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 20:19:14 +0100 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /drivers/rtc/rtc-s3c.c | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
| download | kernel_samsung_smdk4412-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.zip kernel_samsung_smdk4412-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.tar.gz kernel_samsung_smdk4412-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'drivers/rtc/rtc-s3c.c')
| -rw-r--r-- | drivers/rtc/rtc-s3c.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index f26e0ca..fed86e5 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -26,10 +26,6 @@ #include <asm/uaccess.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/rtc.h> - -#include <asm/mach/time.h> - #include <asm/plat-s3c/regs-rtc.h> /* I have yet to find an S3C implementation with more than one |