diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 14:52:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 14:52:43 -0700 |
| commit | f9cc8475e7595dbb41a9567f83288e2cd7445b6c (patch) | |
| tree | ee7b80def9339c51413f6bb5fc9557643dc4ead0 /drivers/input | |
| parent | 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 (diff) | |
| parent | 5b802344357338a4d645beac8ca97470bcbe3542 (diff) | |
| download | linux-f9cc8475e7595dbb41a9567f83288e2cd7445b6c.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3490/1: i.MX: move uart resources to board files
[ARM] 3488/1: make icedcc_putc do the right thing
[ARM] 3487/1: IXP4xx: Support non-PCI systems
[ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/corgi_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c index 1042987856f7..5013703db0e6 100644 --- a/drivers/input/touchscreen/corgi_ts.c +++ b/drivers/input/touchscreen/corgi_ts.c @@ -17,7 +17,7 @@ #include <linux/interrupt.h> #include <linux/module.h> #include <linux/slab.h> -#include <asm/irq.h> +//#include <asm/irq.h> #include <asm/arch/sharpsl.h> #include <asm/arch/hardware.h> |