From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 26 Aug 2011 15:53:17 +0000 (+0000)
Subject: Merge branch 'next/devel' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: next-20110829~91^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=91dc67d94810fad9301bbe089ec8232c8d4adf91;p=karo-tx-linux.git

Merge branch 'next/devel' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into for-next

Conflicts:
	arch/arm/mach-imx/Makefile
	arch/arm/mach-mx5/Kconfig
---

91dc67d94810fad9301bbe089ec8232c8d4adf91
diff --cc arch/arm/mach-imx/Makefile
index db6394a77e85,0a5332c694bd..f87cc5517136
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@@ -1,12 -1,12 +1,12 @@@
  obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o
  
 -obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o
 -obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o
 +obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o
 +obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o
  
- obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o
 -obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
++obj-$(CONFIG_SOC_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
  
 -obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o
 -obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
 +obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
 +obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
  
  obj-$(CONFIG_SOC_IMX31) += mm-imx31.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o
  obj-$(CONFIG_SOC_IMX35) += mm-imx35.o cpu-imx35.o clock-imx35.o ehci-imx35.o
diff --cc arch/arm/mach-mx5/Kconfig
index b4f5ab669e48,fb4c503bb052..3d4c31306ca7
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@@ -152,7 -142,7 +147,8 @@@ config MX51_EFIKA_COMMO
  	bool
  	select SOC_IMX51
  	select IMX_HAVE_PLATFORM_IMX_UART
 +	select IMX_HAVE_PLATFORM_MXC_EHCI
+ 	select IMX_HAVE_PLATFORM_PATA_IMX
  	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
  	select IMX_HAVE_PLATFORM_SPI_IMX
  	select MXC_ULPI if USB_ULPI
diff --cc arch/arm/mach-mxs/mach-mx28evk.c
index 3f86e7a4d2cc,4a3cca3725f2..220b35ae4151
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@@ -16,7 -16,11 +16,10 @@@
  #include <linux/platform_device.h>
  #include <linux/gpio.h>
  #include <linux/leds.h>
 -#include <linux/irq.h>
  #include <linux/clk.h>
+ #include <linux/i2c.h>
+ #include <linux/regulator/machine.h>
+ #include <linux/regulator/fixed.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>