---

yaml --- r: 339773 b: refs/heads/master c: f797793 h: refs/heads/master i: 339771: 2daa282 v: v3
git-mirror · Oct 29, 2012 · 5d0ff06 · 5d0ff06
1 parent ed571dc
commit 5d0ff06
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 36 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fcfdbcacf6fa234064126e5b18c720ca27bc6e7
+refs/heads/master: f7977939e956bdf6558ae6f4b743653db9f5c291
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -959,7 +959,6 @@ config ARCH_ZYNQ
 	bool "Xilinx Zynq ARM Cortex A9 Platform"
 	select ARM_AMBA
 	select ARM_GIC
-	select CLKDEV_LOOKUP
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select ICST

diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
@@ -199,7 +199,6 @@ machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
 plat-$(CONFIG_ARCH_MXC)		+= mxc
 plat-$(CONFIG_ARCH_OMAP)	+= omap
 plat-$(CONFIG_ARCH_S3C64XX)	+= samsung
-plat-$(CONFIG_ARCH_ZYNQ)	+= versatile
 plat-$(CONFIG_PLAT_IOP)		+= iop
 plat-$(CONFIG_PLAT_NOMADIK)	+= nomadik
 plat-$(CONFIG_PLAT_ORION)	+= orion

diff --git a/trunk/arch/arm/mach-zynq/common.c b/trunk/arch/arm/mach-zynq/common.c
@@ -31,7 +31,6 @@
 #include <asm/hardware/cache-l2x0.h>
 
 #include <mach/zynq_soc.h>
-#include <mach/clkdev.h>
 #include "common.h"
 
 static struct of_device_id zynq_of_bus_ids[] __initdata = {

diff --git a/trunk/arch/arm/mach-zynq/include/mach/clkdev.h b/trunk/arch/arm/mach-zynq/include/mach/clkdev.h