diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 14:52:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 14:52:35 -0800 |
| commit | b9a0d06a35c382c02f471a0815e2e27cdfe1c7f9 (patch) | |
| tree | 368ce644cc63a1a377b9254b440bfa73fd970919 /arch/arm/mach-w90x900/time.c | |
| parent | 62568510b8e2679cbc331d7de10ea9ba81ae8b3d (diff) | |
| parent | e6b50c8d58bde1cdc5c9c9520be7ed8921d26aab (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
TWL4030: fix clk API usage
[ARM] 5364/1: allow flush_ioremap_region() to be used from modules
[ARM] w90x900: fix build errors and warnings
[ARM] i.MX add missing include
[ARM] i.MX: fix breakage from commit 278892736e99330195c8ae5861bcd9d791bbf19e
[ARM] i.MX: remove LCDC controller register definitions from imx-regs.h
Diffstat (limited to 'arch/arm/mach-w90x900/time.c')
| -rw-r--r-- | arch/arm/mach-w90x900/time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c index 3a69e381f31..bcc838f6b39 100644 --- a/arch/arm/mach-w90x900/time.c +++ b/arch/arm/mach-w90x900/time.c @@ -28,7 +28,6 @@ #include <asm/mach/irq.h> #include <asm/mach/time.h> -#include <mach/system.h> #include <mach/map.h> #include <mach/regs-timer.h> |