diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-08 12:58:55 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-08 12:58:55 +0400 |
| commit | 552dc340bce3b28f4af33c9134adafa5efacf1c9 (patch) | |
| tree | 8ec5d6d4f7462e92baa0732aa2c47cc33a0b851c /arch/arm/configs | |
| parent | a9fda02bfc91a281cd812ae15dabe6bfb9574f90 (diff) | |
| parent | ee621dd619b9a85eced150fc06e352fef54cfda0 (diff) | |
| download | linux-552dc340bce3b28f4af33c9134adafa5efacf1c9.tar.xz | |
Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/at91sam9g20ek_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig index f1bac70d6ce9..9e90e6d79297 100644 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ b/arch/arm/configs/at91sam9g20ek_defconfig @@ -13,6 +13,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91SAM9G20=y CONFIG_MACH_AT91SAM9G20EK=y +CONFIG_MACH_AT91SAM9G20EK_2MMC=y CONFIG_AT91_PROGRAMMABLE_CLOCKS=y # CONFIG_ARM_THUMB is not set CONFIG_AEABI=y |