diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-06 13:07:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-06 13:07:32 -0400 |
| commit | 70f05366b71c51c35c25c0b76b4318fbc26c975a (patch) | |
| tree | d31230b93ba7df50d87eb11b1dba091641a9b89e /arch/arm/mach-pnx4008/core.c | |
| parent | c0bc8721b8d0380ec69fa97578c91201201b05a9 (diff) | |
| parent | 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/arm/mach-pnx4008/core.c')
| -rw-r--r-- | arch/arm/mach-pnx4008/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c index ba91daad64f..3d73c1e9375 100644 --- a/arch/arm/mach-pnx4008/core.c +++ b/arch/arm/mach-pnx4008/core.c @@ -27,7 +27,6 @@ #include <linux/spi/spi.h> #include <asm/hardware.h> -#include <asm/irq.h> #include <asm/io.h> #include <asm/setup.h> #include <asm/mach-types.h> @@ -36,7 +35,6 @@ #include <asm/system.h> #include <asm/mach/arch.h> -#include <asm/mach/irq.h> #include <asm/mach/map.h> #include <asm/mach/time.h> |