sh: remove intc2 code

There is no point in keeping around the now unused intc2 code. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
git-mirror · Sep 21, 2007 · 96290d8 · 96290d8
1 parent 48180ca
commit 96290d8
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 109 deletions.
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
@@ -181,9 +181,6 @@ config CPU_HAS_MASKREG_IRQ
 config CPU_HAS_INTC_IRQ
 	bool
 
-config CPU_HAS_INTC2_IRQ
-	bool
-
 config CPU_HAS_IPR_IRQ
 	bool
 

diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile
@@ -6,4 +6,3 @@ obj-y	+= imask.o
 obj-$(CONFIG_CPU_HAS_IPR_IRQ)		+= ipr.o
 obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)	+= maskreg.o
 obj-$(CONFIG_CPU_HAS_INTC_IRQ)		+= intc.o
-obj-$(CONFIG_CPU_HAS_INTC2_IRQ)		+= intc2.o
diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
@@ -31,7 +31,6 @@ config CPU_SH4AL_DSP
 config CPU_SUBTYPE_ST40
 	bool
 	select CPU_SH4
-	select CPU_HAS_INTC2_IRQ
 
 config CPU_SHX2
 	bool

diff --git a/include/asm-sh/hw_irq.h b/include/asm-sh/hw_irq.h
@@ -6,24 +6,6 @@
 
 extern atomic_t irq_err_count;
 
-struct intc2_data {
-	unsigned short irq;
-	unsigned char ipr_offset, ipr_shift;
-	unsigned char msk_offset, msk_shift;
-	unsigned char priority;
-};
-
-struct intc2_desc {
-	unsigned long prio_base;
-	unsigned long msk_base;
-	unsigned long mskclr_base;
-	struct intc2_data *intc2_data;
-	unsigned int nr_irqs;
-	struct irq_chip chip;
-};
-
-void register_intc2_controller(struct intc2_desc *);
-
 struct ipr_data {
 	unsigned char irq;
 	unsigned char ipr_idx;		/* Index for the IPR registered */
-Original file line number
+Diff line change
@@ Expand Up / @@ -181,9 +181,6 @@ config CPU_HAS_MASKREG_IRQ @@
     config CPU_HAS_INTC_IRQ
     	bool
-    config CPU_HAS_INTC2_IRQ
-    	bool
     config CPU_HAS_IPR_IRQ
     	bool
@@ Expand Down @@