]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/devel' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 15:53:17 +0000 (15:53 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 15:53:17 +0000 (15:53 +0000)
Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/mach-mx5/Kconfig

1  2 
arch/arm/mach-imx/Makefile
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx51.h
arch/arm/mach-mx5/mx51_efika.c
arch/arm/mach-mxs/mach-mx23evk.c
arch/arm/mach-mxs/mach-mx28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
arch/arm/plat-mxc/devices/Kconfig
arch/arm/plat-mxc/include/mach/common.h

index db6394a77e855ee26e3e69a53c8d9b526735b428,0a5332c694bd15c71ddc9894df1225f970a734bd..f87cc5517136f5a3d1afb7b90e9b80cbcb301267
@@@ -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
index b4f5ab669e486685d8d210f4f30a36f4082287d7,fb4c503bb052647bc0d85829665961db14d5f319..3d4c31306ca7f1a0dce7513982419564a231f56b
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
index 3f86e7a4d2cc24c04897cea09b78680b25bf9556,4a3cca3725f22e7d7e547e013f205a62fde2b9f3..220b35ae4151eddbb8c81b351eb7cb872ac0333a
  #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>
Simple merge