From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 10 Aug 2010 22:17:52 +0000 (+0100)
Subject: Merge branches 'master' and 'devel' into for-linus
X-Git-Tag: v2.6.36-rc1~102^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b019a41553a919965bb02d07d54e3e6c57a796d;p=platform%2Fkernel%2Flinux-stable.git

Merge branches 'master' and 'devel' into for-linus

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

0b019a41553a919965bb02d07d54e3e6c57a796d
diff --cc arch/arm/Kconfig
index 05fc7cf,37a3645..9295110
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1120,11 -1122,11 +1144,11 @@@ config SM
  	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
  	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
  		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
- 		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
 -		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310)
++		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
  	depends on GENERIC_CLOCKEVENTS
  	select USE_GENERIC_SMP_HELPERS
- 	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \
- 		 ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
 -	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\
 -			ARCH_S5PV310)
++	select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
++		 ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4
  	help
  	  This enables support for systems with more than one CPU. If you have
  	  a system with only one CPU, like most personal computers, say N. If
@@@ -1194,10 -1196,9 +1218,10 @@@ config LOCAL_TIMER
  	bool "Use local timer interrupts"
  	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
  		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
- 		ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
 -		ARCH_S5PV310 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
 -	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
 -		ARCH_U8500 || ARCH_VEXPRESS)
++		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
 +	default y
- 	select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\
- 		ARCH_U8500 || ARCH_TEGRA
++	select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
++		ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS
  	help
  	  Enable support for local timers on SMP platforms, rather then the
  	  legacy IPI broadcast method.  Local timers allows the system
diff --cc arch/arm/mm/Kconfig
index e1fd98f,d6ffcee..33c3f57
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -771,8 -771,8 +771,8 @@@ config CACHE_L2X
  	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 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
- 		   ARCH_TEGRA
 -		   ARCH_S5PV310
++		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \
++		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4
  	default y
  	select OUTER_CACHE
  	select OUTER_CACHE_SYNC
diff --cc drivers/ata/Makefile
index 6540632,e87d644..158eaa9
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@@ -88,9 -87,10 +88,11 @@@ obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_
  obj-$(CONFIG_PATA_QDI)		+= pata_qdi.o
  obj-$(CONFIG_PATA_RB532)	+= pata_rb532_cf.o
  obj-$(CONFIG_PATA_RZ1000)	+= pata_rz1000.o
 +obj-$(CONFIG_PATA_SAMSUNG_CF)	+= pata_samsung_cf.o
  obj-$(CONFIG_PATA_WINBOND_VLB)	+= pata_winbond.o
  
+ obj-$(CONFIG_PATA_PXA)		+= pata_pxa.o
+ 
  # Should be last but two libata driver
  obj-$(CONFIG_PATA_ACPI)		+= pata_acpi.o
  # Should be last but one libata driver