diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:31:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:31:38 -0500 |
| commit | bea15fd77ffa1338c293328b8c74a120be53e861 (patch) | |
| tree | be8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/mach-highbank | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| parent | 72ee8499eb27f5724ac97b147350a5457a598aa3 (diff) | |
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-highbank')
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-highbank/include/mach/irqs.h | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 7afbe1e55beb..ee228ef3d27d 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
| 34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
| 35 | #include <asm/mach/time.h> | 35 | #include <asm/mach/time.h> |
| 36 | #include <mach/irqs.h> | ||
| 37 | 36 | ||
| 38 | #include "core.h" | 37 | #include "core.h" |
| 39 | #include "sysregs.h" | 38 | #include "sysregs.h" |
diff --git a/arch/arm/mach-highbank/include/mach/irqs.h b/arch/arm/mach-highbank/include/mach/irqs.h deleted file mode 100644 index 9746aab14e9a..000000000000 --- a/arch/arm/mach-highbank/include/mach/irqs.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __MACH_IRQS_H | ||
| 2 | #define __MACH_IRQS_H | ||
| 3 | |||
| 4 | #define NR_IRQS 192 | ||
| 5 | |||
| 6 | #endif | ||