From 8ee571e3abe537ecdf2589dc9afa3c723d9ec6b8 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <festevam@gmail.com>
Date: Sat, 28 May 2011 11:11:34 -0300
Subject: [PATCH] --- yaml --- r: 258633 b: refs/heads/master c:
 38c7364917650e809945a4ad1b703f333564905e h: refs/heads/master i:   258631:
 8e2ddd0a6f719d0525f7c51cd5bc757a6fd3bbd0 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/configs/mx51_defconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 897fd3f704ec..3a212ed00207 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bb7fa1e6598e73172499f6120dad9bf59bb3844
+refs/heads/master: 38c7364917650e809945a4ad1b703f333564905e
diff --git a/trunk/arch/arm/configs/mx51_defconfig b/trunk/arch/arm/configs/mx51_defconfig
index 0ace16cba9b5..88c5802a2351 100644
--- a/trunk/arch/arm/configs/mx51_defconfig
+++ b/trunk/arch/arm/configs/mx51_defconfig
@@ -106,6 +106,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_SDHCI=m
@@ -145,7 +146,7 @@ CONFIG_ROOT_NFS=y
 CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=y
 CONFIG_MAGIC_SYSRQ=y