From: Olof Johansson <olof@lixom.net>
Date: Tue, 6 Nov 2012 15:51:06 +0000 (-0800)
Subject: Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=66267ee58732bb4c21c7bbba004ee481b8ad2b30;p=linux-beck.git

Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup

From Michal Simek:

* 'arm-next' of git://git.xilinx.com/linux-xlnx:
  zynq: move static peripheral mappings
  zynq: remove use of CLKDEV_LOOKUP
  zynq: use pl310 device tree bindings
  zynq: use GIC device tree bindings
  + Linux 3.7-rc3
---

66267ee58732bb4c21c7bbba004ee481b8ad2b30
diff --cc arch/arm/Makefile
index 451757d85ee3,554cfac41429..97252d86a701
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -195,9 -196,9 +196,8 @@@ machine-$(CONFIG_ARCH_ZYNQ)		+= zyn
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
 -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