---

yaml --- r: 316609 b: refs/heads/master c: 50667d6 h: refs/heads/master i: 316607: 4bcafb1 v: v3
git-mirror · Jul 11, 2012 · 69dcb2f · 69dcb2f
1 parent 04ad45d
commit 69dcb2f
Show file tree

Hide file tree

Showing 10 changed files with 764 additions and 1,569 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ca1c5a4bf4105d6f2f2a46892495953dd3e2fec
+refs/heads/master: 50667d63085af108f625c83102430c1d74931d78
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -888,7 +888,7 @@ config ARCH_U300
 	select ARM_VIC
 	select GENERIC_CLOCKEVENTS
 	select CLKDEV_LOOKUP
-	select HAVE_MACH_CLKDEV
+	select COMMON_CLK
 	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	help

diff --git a/trunk/arch/arm/mach-u300/Makefile b/trunk/arch/arm/mach-u300/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel, U300 machine.
 #
 
-obj-y		:= core.o clock.o timer.o
+obj-y		:= core.o timer.o
 obj-m		:=
 obj-n		:=
 obj-		:=