summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/at91sam9m10g45ek_defconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:59:14 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:59:14 +0200
commit649f558483f9959c0ac4123da8c7b647d9808be5 (patch)
treedc899119f1ca43afc580de0e6a944030e80ecff8 /arch/arm/configs/at91sam9m10g45ek_defconfig
parent3a997060d523ea73aa9182a503f5707b27d600f6 (diff)
parent5be55211463dc72b2872b14d09190c103e63c145 (diff)
downloadbarebox-649f558483f9959c0ac4123da8c7b647d9808be5.tar.gz
barebox-649f558483f9959c0ac4123da8c7b647d9808be5.tar.xz
Merge branch 'for-next/defconfig'
Diffstat (limited to 'arch/arm/configs/at91sam9m10g45ek_defconfig')
-rw-r--r--arch/arm/configs/at91sam9m10g45ek_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9m10g45ek_defconfig b/arch/arm/configs/at91sam9m10g45ek_defconfig
index b72e964d7f..e22f80a9d7 100644
--- a/arch/arm/configs/at91sam9m10g45ek_defconfig
+++ b/arch/arm/configs/at91sam9m10g45ek_defconfig
@@ -1,5 +1,4 @@
CONFIG_ARCH_AT91SAM9G45=y
-CONFIG_MACH_AT91SAM9M10G45EK=y
CONFIG_AEABI=y
# CONFIG_CMD_ARM_CPUINFO is not set
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
@@ -75,3 +74,4 @@ CONFIG_LED_TRIGGERS=y
CONFIG_FS_FAT=y
CONFIG_FS_FAT_WRITE=y
CONFIG_FS_FAT_LFN=y
+CONFIG_LZO_DECOMPRESS=y