Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

diff --cc arch/arm/configs/omap_4430sdp_defconfig
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
index 029c6c9b3a6d68773e52f194293bd81a8798f9e6,8ba8fb5b2514cdb09343f98ea45676aff0b8fab8..180ac112e527b240099ba5daf9ce0d43d2a4ff48
--- 1/arch/arm/mach-omap2/board-4430sdp.c
--- 2/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -28,8 -27,8 +28,9 @@@
  #include <plat/common.h>
  #include <plat/control.h>
  #include <plat/timer-gp.h>
 +#include <plat/usb.h>
  #include <asm/hardware/gic.h>
+ #include <asm/hardware/cache-l2x0.h>
  
  static struct platform_device sdp4430_lcd_device = {
        .name           = "sdp4430_lcd",

diff --cc arch/arm/plat-omap/Kconfig
index be9484a28b124a0f1eb7f897b7334ccf57c882d8,2e3eec6608647cafa6d1a435cc3681931b35f970..6da796ef82bd12df19c913a78ff3c4f012cccb2b
--- 1/arch/arm/plat-omap/Kconfig
--- 2/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -28,9 -19,10 +28,10 @@@ config ARCH_OMAP
  
  config ARCH_OMAP3
        bool "TI OMAP3"
 +      depends on ARCH_OMAP2PLUS
        select CPU_V7
 -      select COMMON_CLKDEV
 +      select USB_ARCH_HAS_EHCI
+       select ARM_L1_CACHE_SHIFT_6
  
  config ARCH_OMAP4
        bool "TI OMAP4"

diff --cc arch/arm/plat-omap/include/plat/omap44xx.h
index 8fc15d33089a4eb00a201093f9c8120151ef8b23,c7d628ecb467aa57a85090af29a9904488643604..2302474a374896c20849ba235c8f6d247cacdb42
--- 1/arch/arm/plat-omap/include/plat/omap44xx.h
--- 2/arch/arm/plat-omap/include/plat/omap44xx.h
+++ b/arch/arm/plat-omap/include/plat/omap44xx.h
@@@ -40,12 -40,10 +40,13 @@@
  #define OMAP44XX_GIC_CPU_BASE         0x48240100
  #define OMAP44XX_SCU_BASE             0x48240000
  #define OMAP44XX_LOCAL_TWD_BASE               0x48240600
+ #define OMAP44XX_L2CACHE_BASE         0x48242000
  #define OMAP44XX_WKUPGEN_BASE         0x48281000
 +#define OMAP44XX_MCPDM_BASE           0x40132000
 +#define OMAP44XX_MCPDM_L3_BASE                0x49032000
  
  #define OMAP44XX_MAILBOX_BASE         (L4_44XX_BASE + 0xF4000)
 +#define OMAP44XX_HSUSB_OTG_BASE               (L4_44XX_BASE + 0xAB000)
  
  #endif /* __ASM_ARCH_OMAP44XX_H */
  

diff --cc arch/arm/plat-omap/io.c
Simple merge

diff --cc drivers/char/hw_random/Kconfig
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mtd/maps/Kconfig
Simple merge

diff --cc drivers/mtd/maps/Makefile
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc sound/soc/omap/omap-mcbsp.c
Simple merge