diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 12:06:36 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 12:06:36 -0500 |
commit | 421b759b86eb8a914cbbd11f6d09a74f411762c6 (patch) | |
tree | 505ca7f23987d8eaaa519a7e8506b854e2c0d030 /arch/arm/configs/imx_v4_v5_defconfig | |
parent | e067096c8d57d191f29d734cd5692695c95cc36e (diff) | |
parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) |
Merge branch 'samsung/cleanup' into next/boards
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Lots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
-rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index fccb4703bacb..a22e93079063 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
@@ -18,9 +18,10 @@ CONFIG_ARCH_MXC=y | |||
18 | CONFIG_ARCH_IMX_V4_V5=y | 18 | CONFIG_ARCH_IMX_V4_V5=y |
19 | CONFIG_ARCH_MX1ADS=y | 19 | CONFIG_ARCH_MX1ADS=y |
20 | CONFIG_MACH_SCB9328=y | 20 | CONFIG_MACH_SCB9328=y |
21 | CONFIG_MACH_APF9328=y | ||
21 | CONFIG_MACH_MX21ADS=y | 22 | CONFIG_MACH_MX21ADS=y |
22 | CONFIG_MACH_MX25_3DS=y | 23 | CONFIG_MACH_MX25_3DS=y |
23 | CONFIG_MACH_EUKREA_CPUIMX25=y | 24 | CONFIG_MACH_EUKREA_CPUIMX25SD=y |
24 | CONFIG_MACH_MX27ADS=y | 25 | CONFIG_MACH_MX27ADS=y |
25 | CONFIG_MACH_PCM038=y | 26 | CONFIG_MACH_PCM038=y |
26 | CONFIG_MACH_CPUIMX27=y | 27 | CONFIG_MACH_CPUIMX27=y |
@@ -71,17 +72,16 @@ CONFIG_MTD_CFI_GEOMETRY=y | |||
71 | CONFIG_MTD_CFI_INTELEXT=y | 72 | CONFIG_MTD_CFI_INTELEXT=y |
72 | CONFIG_MTD_PHYSMAP=y | 73 | CONFIG_MTD_PHYSMAP=y |
73 | CONFIG_MTD_NAND=y | 74 | CONFIG_MTD_NAND=y |
75 | CONFIG_MTD_NAND_MXC=y | ||
74 | CONFIG_MTD_UBI=y | 76 | CONFIG_MTD_UBI=y |
75 | CONFIG_MISC_DEVICES=y | 77 | CONFIG_MISC_DEVICES=y |
76 | CONFIG_EEPROM_AT24=y | 78 | CONFIG_EEPROM_AT24=y |
77 | CONFIG_EEPROM_AT25=y | 79 | CONFIG_EEPROM_AT25=y |
78 | CONFIG_NETDEVICES=y | 80 | CONFIG_NETDEVICES=y |
79 | CONFIG_NET_ETHERNET=y | ||
80 | CONFIG_SMC91X=y | ||
81 | CONFIG_DM9000=y | 81 | CONFIG_DM9000=y |
82 | CONFIG_SMC91X=y | ||
82 | CONFIG_SMC911X=y | 83 | CONFIG_SMC911X=y |
83 | # CONFIG_NETDEV_1000 is not set | 84 | CONFIG_SMSC_PHY=y |
84 | # CONFIG_NETDEV_10000 is not set | ||
85 | # CONFIG_INPUT_MOUSEDEV is not set | 85 | # CONFIG_INPUT_MOUSEDEV is not set |
86 | CONFIG_INPUT_EVDEV=y | 86 | CONFIG_INPUT_EVDEV=y |
87 | # CONFIG_INPUT_KEYBOARD is not set | 87 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -99,6 +99,7 @@ CONFIG_I2C_CHARDEV=y | |||
99 | CONFIG_I2C_IMX=y | 99 | CONFIG_I2C_IMX=y |
100 | CONFIG_SPI=y | 100 | CONFIG_SPI=y |
101 | CONFIG_SPI_IMX=y | 101 | CONFIG_SPI_IMX=y |
102 | CONFIG_SPI_SPIDEV=y | ||
102 | CONFIG_W1=y | 103 | CONFIG_W1=y |
103 | CONFIG_W1_MASTER_MXC=y | 104 | CONFIG_W1_MASTER_MXC=y |
104 | CONFIG_W1_SLAVE_THERM=y | 105 | CONFIG_W1_SLAVE_THERM=y |
@@ -138,6 +139,7 @@ CONFIG_MMC=y | |||
138 | CONFIG_MMC_MXC=y | 139 | CONFIG_MMC_MXC=y |
139 | CONFIG_NEW_LEDS=y | 140 | CONFIG_NEW_LEDS=y |
140 | CONFIG_LEDS_CLASS=y | 141 | CONFIG_LEDS_CLASS=y |
142 | CONFIG_LEDS_GPIO=y | ||
141 | CONFIG_LEDS_MC13783=y | 143 | CONFIG_LEDS_MC13783=y |
142 | CONFIG_LEDS_TRIGGERS=y | 144 | CONFIG_LEDS_TRIGGERS=y |
143 | CONFIG_LEDS_TRIGGER_TIMER=y | 145 | CONFIG_LEDS_TRIGGER_TIMER=y |