From: Tony Lindgren <tony@atomide.com>
Date: Mon, 1 Mar 2010 22:19:05 +0000 (-0800)
Subject: Merge with mainline to remove plat-omap/Kconfig conflict
X-Git-Tag: v2.6.34-rc1~230^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d702d12167a2c05a346f49aac7a311d597762495;p=linux-block.git

Merge ... mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig
---

d702d12167a2c05a346f49aac7a311d597762495
diff --cc arch/arm/mach-omap2/board-4430sdp.c
index 029c6c9b3a6d,8ba8fb5b2514..180ac112e527
--- a/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 be9484a28b12,2e3eec660864..6da796ef82bd
--- a/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 8fc15d33089a,c7d628ecb467..2302474a3748
--- a/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 */