From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 17 May 2010 10:52:31 +0000 (+0100)
Subject: Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa... 
X-Git-Tag: v2.6.35-rc1~503^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c39e52a793f5599582dbacf4d8f62634a492f79e;p=~shefty%2Frdma-dev.git

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel

Conflicts:
	arch/arm/Makefile
	arch/arm/common/Makefile
	arch/arm/mm/Kconfig
---

c39e52a793f5599582dbacf4d8f62634a492f79e
diff --cc arch/arm/Kconfig
index c5408bf1bf4,c5408bf1bf4,c5408bf1bf4,c5408bf1bf4,88f9334110c,540f8592211,c5408bf1bf4,c5408bf1bf4,1459231bcbb,4bb7730a268..daaa4b2b46e
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@@@@@ -238,18 -238,18 -238,18 -238,18 -245,16 -238,18 -238,18 -238,18 -238,18 -238,21 +245,19 @@@@@@@@@@@ config ARCH_INTEGRATO
          	bool "ARM Ltd. Integrator family"
          	select ARM_AMBA
          	select ARCH_HAS_CPUFREQ
---- -----	select HAVE_CLK
          	select COMMON_CLKDEV
--------- 	select ICST525
+++++++++ 	select ICST
+++++++++ 	select GENERIC_TIME
+++++++++ 	select GENERIC_CLOCKEVENTS
+++++++++ 	select PLAT_VERSATILE
          	help
          	  Support for ARM's Integrator platform.
          
          config ARCH_REALVIEW
          	bool "ARM Ltd. RealView family"
          	select ARM_AMBA
---- -----	select HAVE_CLK
          	select COMMON_CLKDEV
--------- 	select ICST307
+++++++++ 	select ICST
          	select GENERIC_TIME
          	select GENERIC_CLOCKEVENTS
          	select ARCH_WANT_OPTIONAL_GPIOLIB
@@@@@@@@@@@ -260,9 -260,9 -260,9 -260,9 -265,8 -260,9 -260,9 -260,9 -260,9 -265,9 +270,8 @@@@@@@@@@@ config ARCH_VERSATIL
          	bool "ARM Ltd. Versatile family"
          	select ARM_AMBA
          	select ARM_VIC
---- -----	select HAVE_CLK
          	select COMMON_CLKDEV
--------- 	select ICST307
+++++++++ 	select ICST
          	select GENERIC_TIME
          	select GENERIC_CLOCKEVENTS
          	select ARCH_WANT_OPTIONAL_GPIOLIB
diff --cc arch/arm/Makefile
index ed820e737a8,ed820e737a8,ed820e737a8,ed820e737a8,ed820e737a8,ed820e737a8,ed820e737a8,ed820e737a8,b3a3518a36f,67c92efa311..219cb4ee7e3
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@@@@@@@@@ -192,6 -192,6 -192,6 -192,6 -192,6 -192,6 -192,6 -192,6 -196,7 -193,7 +197,8 @@@@@@@@@@@ plat-$(CONFIG_PLAT_PXA)		:= px
          plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung
          plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx samsung
          plat-$(CONFIG_PLAT_S5P)		:= s5p samsung
++++++++ +plat-$(CONFIG_PLAT_SPEAR)	:= spear
+++++++++ plat-$(CONFIG_PLAT_VERSATILE)	:= versatile
          
          ifeq ($(CONFIG_ARCH_EBSA110),y)
          # This is what happens if you forget the IOCS16 line.
diff --cc arch/arm/common/Kconfig
index 4efbb9df044,4efbb9df044,4efbb9df044,4efbb9df044,cf905909188,4efbb9df044,4efbb9df044,4efbb9df044,4efbb9df044,323d2d28952..0a34c818692
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@@@@@@@@@@ -12,12 -12,12 -12,12 -12,12 -12,15 -12,12 -12,12 -12,12 -12,12 -12,9 +12,12 @@@@@@@@@@@ config ARM_VIC_N
          	  The maximum number of VICs available in the system, for
          	  power management.
          
--------- config ICST525
    -     	bool
    -     
    -     config ICST307
+++++++++ config ICST
          	bool
          
---- ---- config ICST307
++++ +++++config PL330
         +	bool
         +
          config SA1111
          	bool
          	select DMABOUNCE if !ARCH_PXA
diff --cc arch/arm/common/Makefile
index 76be7ff2a7c,76be7ff2a7c,76be7ff2a7c,76be7ff2a7c,df20c265020,76be7ff2a7c,76be7ff2a7c,76be7ff2a7c,76be7ff2a7c,5e8ad0d6c91..e6e8664a941
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@@@@@@@@@@ -4,8 -4,8 -4,8 -4,8 -4,9 -4,8 -4,8 -4,8 -4,8 -4,7 +4,8 @@@@@@@@@@@
          
          obj-$(CONFIG_ARM_GIC)		+= gic.o
          obj-$(CONFIG_ARM_VIC)		+= vic.o
--------- obj-$(CONFIG_ICST525)		+= icst525.o
--------- obj-$(CONFIG_ICST307)		+= icst307.o
+++++++++ obj-$(CONFIG_ICST)		+= icst.o
++++ +++++obj-$(CONFIG_PL330)		+= pl330.o
          obj-$(CONFIG_SA1111)		+= sa1111.o
          obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
          obj-$(CONFIG_DMABOUNCE)		+= dmabounce.o
diff --cc arch/arm/mm/Kconfig
index c4ed9f93f64,c4ed9f93f64,c4ed9f93f64,c4ed9f93f64,573528d9c6d,22c1c839306,c4ed9f93f64,c4ed9f93f64,c4ed9f93f64,270c8e2a449..33027301639
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@@@@@@@@@ -754,7 -754,7 -754,7 -754,7 -754,7 -754,8 -754,7 -754,7 -754,7 -754,8 +754,8 @@@@@@@@@@@ config CACHE_FEROCEON_L2_WRITETHROUG
          config CACHE_L2X0
          	bool "Enable the L2x0 outer cache controller"
          	depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
----- --- 		   REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || ARCH_NOMADIK || ARCH_OMAP4
+++++ +++ 		   REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \
     -    		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500
         -		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_VEXPRESS_CA9X4
++++++++++		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4
          	default y
          	select OUTER_CACHE
          	help