---

yaml --- r: 85538 b: refs/heads/master c: d847afe h: refs/heads/master v: v3
git-mirror · Feb 14, 2008 · 57a91ab · 57a91ab
1 parent 32123cf
commit 57a91ab
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 98 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0906185071bff4b285aed6e89ed607d6f6bf8910
+refs/heads/master: d847afe7d4966d35eb7a6fe6f196a0d7e5633f35
diff --git a/trunk/arch/sh/Kconfig.cpu b/trunk/arch/sh/Kconfig.cpu
@@ -87,9 +87,6 @@ config SH64_ID2815_WORKAROUND
 config CPU_HAS_INTEVT
 	bool
 
-config CPU_HAS_MASKREG_IRQ
-	bool
-
 config CPU_HAS_IPR_IRQ
 	bool
 

diff --git a/trunk/arch/sh/kernel/cpu/irq/Makefile b/trunk/arch/sh/kernel/cpu/irq/Makefile
@@ -6,4 +6,3 @@ obj-y	+= intc.o
 obj-$(CONFIG_SUPERH32)			+= imask.o
 obj-$(CONFIG_CPU_SH5)			+= intc-sh5.o
 obj-$(CONFIG_CPU_HAS_IPR_IRQ)		+= ipr.o
-obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)	+= maskreg.o
diff --git a/trunk/arch/sh/kernel/cpu/irq/maskreg.c b/trunk/arch/sh/kernel/cpu/irq/maskreg.c
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,9 +87,6 @@ config SH64_ID2815_WORKAROUND @@
     config CPU_HAS_INTEVT
     	bool
-    config CPU_HAS_MASKREG_IRQ
-    	bool
     config CPU_HAS_IPR_IRQ
     	bool
@@ Expand Down @@