diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:03:21 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:04:25 -0400 |
| commit | ffe315012510165ce82e4dd4767f0a5dba9edbf7 (patch) | |
| tree | f601cd980af9d0ced5ca9aedecef4fa0d2ca0e15 /arch/arm/configs/at91rm9200_defconfig | |
| parent | e2d3a35ee427aaba99b6c68a56609ce276c51270 (diff) | |
| parent | 4a8e43feeac7996b8de2d5b2823e316917493df4 (diff) | |
Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09
Conflicts:
MAINTAINERS
arch/arm/configs/bcmring_defconfig
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
Diffstat (limited to 'arch/arm/configs/at91rm9200_defconfig')
| -rw-r--r-- | arch/arm/configs/at91rm9200_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/at91rm9200_defconfig b/arch/arm/configs/at91rm9200_defconfig index d54e2acd3ab1..4ae57a34a582 100644 --- a/arch/arm/configs/at91rm9200_defconfig +++ b/arch/arm/configs/at91rm9200_defconfig | |||
| @@ -232,7 +232,7 @@ CONFIG_USB_GADGET=y | |||
| 232 | CONFIG_USB_ETH=m | 232 | CONFIG_USB_ETH=m |
| 233 | CONFIG_USB_MASS_STORAGE=m | 233 | CONFIG_USB_MASS_STORAGE=m |
| 234 | CONFIG_MMC=y | 234 | CONFIG_MMC=y |
| 235 | CONFIG_MMC_AT91=y | 235 | CONFIG_MMC_ATMELMCI=y |
| 236 | CONFIG_NEW_LEDS=y | 236 | CONFIG_NEW_LEDS=y |
| 237 | CONFIG_LEDS_CLASS=y | 237 | CONFIG_LEDS_CLASS=y |
| 238 | CONFIG_LEDS_GPIO=y | 238 | CONFIG_LEDS_GPIO=y |