diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 10:31:38 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 10:31:38 +0000 |
commit | bea15fd77ffa1338c293328b8c74a120be53e861 (patch) | |
tree | be8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/kernel | |
parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
parent | 72ee8499eb27f5724ac97b147350a5457a598aa3 (diff) | |
download | op-kernel-dev-bea15fd77ffa1338c293328b8c74a120be53e861.zip op-kernel-dev-bea15fd77ffa1338c293328b8c74a120be53e861.tar.gz |
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 8c57dd3..6095517 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -25,8 +25,6 @@ #include <linux/timer.h> #include <linux/irq.h> -#include <linux/mc146818rtc.h> - #include <asm/leds.h> #include <asm/thread_info.h> #include <asm/sched_clock.h> |