---

yaml --- r: 283617 b: refs/heads/master c: 215d6cc h: refs/heads/master i: 283615: 114e4c4 v: v3
git-mirror · Nov 11, 2011 · 65ce3d6 · 65ce3d6
1 parent da477a5
commit 65ce3d6
Show file tree

Hide file tree

Showing 5 changed files with 615 additions and 30 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6831f3a9184a1c5400e4fa2f2d3172b6dfb2c805
+refs/heads/master: 215d6cc9230c2a42a643c4cd296680040eeb1f49
diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig
@@ -33,7 +33,6 @@ config ARCH_R8A7740
 	select CPU_V7
 	select SH_CLK_CPG
 	select ARCH_WANT_OPTIONAL_GPIOLIB
-	select ARM_GIC
 
 comment "SH-Mobile Board Type"
 

diff --git a/trunk/arch/arm/mach-shmobile/Makefile b/trunk/arch/arm/mach-shmobile/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_ARCH_SH7367)	+= entry-intc.o
 obj-$(CONFIG_ARCH_SH7377)	+= entry-intc.o
 obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o
 obj-$(CONFIG_ARCH_SH73A0)	+= entry-gic.o
-obj-$(CONFIG_ARCH_R8A7740)	+= entry-gic.o
+obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc.o
 
 # PM objects
 obj-$(CONFIG_SUSPEND)		+= suspend.o