aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-01-03 15:44:31 -0500
committerRob Herring <rob.herring@calxeda.com>2012-01-30 14:25:42 -0500
commitfdfa64a4b7e6253583fa49f26e676d119bc22e76 (patch)
treeb150a34d0aaa94c7a58d21704353be2361723e2f
parenta2be01b15443d5bc45d23b970dab0abba773ef2a (diff)
ARM: highbank: select SPARSE_IRQ and remove irqs.h
irqs.h is optional now for SPARSE_IRQ, so select it and remove mach/irqs.h from highbank. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-highbank/highbank.c1
-rw-r--r--arch/arm/mach-highbank/include/mach/irqs.h6
3 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 30e7840498ce..dcd77dbf4660 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -349,6 +349,7 @@ config ARCH_HIGHBANK
349 select GENERIC_CLOCKEVENTS 349 select GENERIC_CLOCKEVENTS
350 select HAVE_ARM_SCU 350 select HAVE_ARM_SCU
351 select HAVE_SMP 351 select HAVE_SMP
352 select SPARSE_IRQ
352 select USE_OF 353 select USE_OF
353 help 354 help
354 Support for the Calxeda Highbank SoC based boards. 355 Support for the Calxeda Highbank SoC based boards.
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