---

yaml --- r: 308270 b: refs/heads/master c: 5df33a6 h: refs/heads/master v: v3
git-mirror · May 12, 2012 · e7d6889 · e7d6889
1 parent 54daa49
commit e7d6889
Show file tree

Hide file tree

Showing 20 changed files with 984 additions and 3,005 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8abc080d33e69dfa2c3dd0f84c31832e2679091
+refs/heads/master: 5df33a62c4a028d6fc7f2dcc159827d09b7334b8
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -6336,9 +6336,7 @@ L:	spear-devel@list.st.com
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:	http://www.st.com/spear
 S:	Maintained
-F:	arch/arm/mach-spear*/clock.c
-F:	arch/arm/plat-spear/clock.c
-F:	arch/arm/plat-spear/include/plat/clock.h
+F:	drivers/clk/spear/
 
 SPEAR PAD MULTIPLEXING SUPPORT
 M:	Viresh Kumar <viresh.kumar@st.com>

diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -980,6 +980,7 @@ config PLAT_SPEAR
 	select ARM_AMBA
 	select ARCH_REQUIRE_GPIOLIB
 	select CLKDEV_LOOKUP
+	select COMMON_CLK
 	select CLKSRC_MMIO
 	select GENERIC_CLOCKEVENTS
 	select HAVE_CLK

diff --git a/trunk/arch/arm/mach-spear3xx/Makefile b/trunk/arch/arm/mach-spear3xx/Makefile
@@ -3,7 +3,7 @@
 #
 
 # common files
-obj-y	+= spear3xx.o clock.o
+obj-y	+= spear3xx.o
 
 # spear300 specific files
 obj-$(CONFIG_MACH_SPEAR300) += spear300.o