now that we're using sparse IRQs, we don't
need to polute <plat/irqs.h> anymore with
the dumb IRQ_BASE/IRQ_END definitions.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
arch/arm/mach-omap1/board-nokia770.c | 2 --
arch/arm/mach-omap2/board-n8x0.c | 2 --
arch/arm/plat-omap/include/plat/irqs.h | 10 +---------
include/linux/platform_data/cbus.h | 2 --
4 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 7990c48..5eb1a7f 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -124,8 +124,6 @@ static struct resource retu_resource[] = {
};
static struct cbus_retu_platform_data nokia770_retu_data = {
- .irq_base = CBUS_RETU_IRQ_BASE,
- .irq_end = CBUS_RETU_IRQ_END,
.devid = CBUS_RETU_DEVICE_ID,
};
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index b3e80c9..f7548e4 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -220,8 +220,6 @@ static struct resource retu_resource[] = {
};
static struct cbus_retu_platform_data n8x0_retu_data = {
- .irq_base = CBUS_RETU_IRQ_BASE,
- .irq_end = CBUS_RETU_IRQ_END,
.devid = CBUS_RETU_DEVICE_ID,
};
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h
index 8c8f517..24eeccd 100644
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -419,15 +419,7 @@
#define OMAP_GPMC_NR_IRQS 8
#define OMAP_GPMC_IRQ_END (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS)
-#define CBUS_RETU_IRQ_BASE OMAP_GPMC_IRQ_END
-#ifdef CONFIG_CBUS_RETU
-#define CBUS_RETU_NR_IRQS 16
-#else
-#define CBUS_RETU_NR_IRQS 0
-#endif
-#define CBUS_RETU_IRQ_END (CBUS_RETU_IRQ_BASE + CBUS_RETU_NR_IRQS)
-
-#define NR_IRQS CBUS_RETU_IRQ_END
+#define NR_IRQS OMAP_GPMC_IRQ_END
#define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32))
diff --git a/include/linux/platform_data/cbus.h b/include/linux/platform_data/cbus.h
index a1c5a26..09809c7 100644
--- a/include/linux/platform_data/cbus.h
+++ b/include/linux/platform_data/cbus.h
@@ -32,8 +32,6 @@ struct cbus_host_platform_data {
};
struct cbus_retu_platform_data {
- int irq_base;
- int irq_end;
int devid;
};
--
1.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
