summaryrefslogtreecommitdiff
path: root/arch/arm/configs/omap1_defconfig
diff options
context:
space:
mode:
authorMichal Nazarewicz <mina86@mina86.com>2012-11-07 01:52:35 +0400
committerFelipe Balbi <balbi@ti.com>2012-11-08 18:00:52 +0400
commit77614e0250611fbeeb94b12e0a0b7f281fe61329 (patch)
tree10b0de7fa8b2d5e62b8d9c49e11e68cc5d77a24b /arch/arm/configs/omap1_defconfig
parent1c90ee0b3e30235165180a1a8ee3fb3cbe47d295 (diff)
downloadlinux-77614e0250611fbeeb94b12e0a0b7f281fe61329.tar.xz
arch: Change defconfigs to point to g_mass_storage.
The File-backed Storage Gadget (g_file_storage) is being removed, since it has been replaced by Mass Storage Gadget (g_mass_storage). This commit changes defconfigs point to the new gadget. Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> (AT91) Acked-by: Tony Lindgren <tony@atomide.com> (OMAP1) Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no> (AVR32) Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'arch/arm/configs/omap1_defconfig')
-rw-r--r--arch/arm/configs/omap1_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index dde2a1af7b39..42eab9a2a0fd 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -214,8 +214,7 @@ CONFIG_USB_TEST=y
CONFIG_USB_GADGET=y
CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_FILE_STORAGE_TEST=y
+CONFIG_USB_MASS_STORAGE=m
CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y