| Message ID | 46dde680f525562e9fd19567deb5247f0bf26842.1351715302.v2.git.mina86@mina86.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/02/2012 02:31 PM, Michal Nazarewicz : > From: Michal Nazarewicz <mina86@mina86.com> > > 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> > --- > arch/arm/configs/afeb9260_defconfig | 2 +- > arch/arm/configs/at91sam9260_defconfig | 2 +- > arch/arm/configs/at91sam9261_defconfig | 2 +- > arch/arm/configs/at91sam9263_defconfig | 2 +- > arch/arm/configs/at91sam9g20_defconfig | 2 +- For AT91 related defconfigs: Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > arch/arm/configs/corgi_defconfig | 2 +- > arch/arm/configs/davinci_all_defconfig | 2 +- > arch/arm/configs/h7202_defconfig | 3 +-- > arch/arm/configs/magician_defconfig | 2 +- > arch/arm/configs/mini2440_defconfig | 2 +- > arch/arm/configs/omap1_defconfig | 3 +-- > arch/arm/configs/prima2_defconfig | 1 - > arch/arm/configs/spitz_defconfig | 2 +- > arch/arm/configs/stamp9g20_defconfig | 2 +- > arch/arm/configs/viper_defconfig | 2 +- > arch/arm/configs/zeus_defconfig | 2 +- > arch/avr32/configs/atngw100_defconfig | 2 +- > arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +- > arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +- > arch/avr32/configs/atngw100_mrmt_defconfig | 2 +- > arch/avr32/configs/atngw100mkii_defconfig | 2 +- > .../avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +- > .../avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +- > arch/avr32/configs/atstk1002_defconfig | 2 +- > arch/avr32/configs/atstk1003_defconfig | 2 +- > arch/avr32/configs/atstk1004_defconfig | 2 +- > arch/avr32/configs/atstk1006_defconfig | 2 +- > arch/avr32/configs/favr-32_defconfig | 2 +- > arch/avr32/configs/hammerhead_defconfig | 2 +- > arch/blackfin/configs/CM-BF527_defconfig | 2 +- > arch/blackfin/configs/CM-BF548_defconfig | 2 +- > arch/blackfin/configs/CM-BF561_defconfig | 2 +- > arch/mips/configs/bcm47xx_defconfig | 2 +- > arch/mips/configs/mtx1_defconfig | 2 +- > arch/sh/configs/ecovec24_defconfig | 2 +- > arch/sh/configs/se7724_defconfig | 2 +- > 37 files changed, 35 insertions(+), 39 deletions(-) > > diff --git a/arch/arm/configs/afeb9260_defconfig b/arch/arm/configs/afeb9260_defconfig > index c285a9d..a8dbc1e 100644 > --- a/arch/arm/configs/afeb9260_defconfig > +++ b/arch/arm/configs/afeb9260_defconfig > @@ -79,7 +79,7 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_RTC_CLASS=y > CONFIG_RTC_DEBUG=y > diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig > index 505b376..0ea5d2c 100644 > --- a/arch/arm/configs/at91sam9260_defconfig > +++ b/arch/arm/configs/at91sam9260_defconfig > @@ -75,7 +75,7 @@ CONFIG_USB_STORAGE_DEBUG=y > CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_RTC_CLASS=y > CONFIG_RTC_DRV_AT91SAM9=y > diff --git a/arch/arm/configs/at91sam9261_defconfig b/arch/arm/configs/at91sam9261_defconfig > index 1e8712e..c87beb9 100644 > --- a/arch/arm/configs/at91sam9261_defconfig > +++ b/arch/arm/configs/at91sam9261_defconfig > @@ -125,7 +125,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_ATMELMCI=m > diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig > index d2050ca..c5212f4 100644 > --- a/arch/arm/configs/at91sam9263_defconfig > +++ b/arch/arm/configs/at91sam9263_defconfig > @@ -133,7 +133,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_SDIO_UART=m > diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig > index e1b0e80..3b18810 100644 > --- a/arch/arm/configs/at91sam9g20_defconfig > +++ b/arch/arm/configs/at91sam9g20_defconfig > @@ -96,7 +96,7 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_ATMELMCI=m > diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig > index 4b8a25d..1fd1d1d 100644 > --- a/arch/arm/configs/corgi_defconfig > +++ b/arch/arm/configs/corgi_defconfig > @@ -218,7 +218,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_PXA=y > diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig > index 67b5abb6..4ea7c95 100644 > --- a/arch/arm/configs/davinci_all_defconfig > +++ b/arch/arm/configs/davinci_all_defconfig > @@ -144,7 +144,7 @@ CONFIG_USB_GADGET_DEBUG_FS=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_USB_CDC_COMPOSITE=m > diff --git a/arch/arm/configs/h7202_defconfig b/arch/arm/configs/h7202_defconfig > index 69405a7..e16d3f3 100644 > --- a/arch/arm/configs/h7202_defconfig > +++ b/arch/arm/configs/h7202_defconfig > @@ -34,8 +34,7 @@ CONFIG_FB_MODE_HELPERS=y > CONFIG_USB_GADGET=m > CONFIG_USB_ZERO=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > -CONFIG_USB_FILE_STORAGE_TEST=y > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_EXT2_FS=y > CONFIG_TMPFS=y > diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig > index a691ef4..557dd29 100644 > --- a/arch/arm/configs/magician_defconfig > +++ b/arch/arm/configs/magician_defconfig > @@ -136,7 +136,7 @@ CONFIG_USB_PXA27X=y > CONFIG_USB_ETH=m > # CONFIG_USB_ETH_RNDIS is not set > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_USB_GPIO_VBUS=y > diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig > index 00630e6..a07948a 100644 > --- a/arch/arm/configs/mini2440_defconfig > +++ b/arch/arm/configs/mini2440_defconfig > @@ -240,7 +240,7 @@ CONFIG_USB_GADGET_S3C2410=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig > index dde2a1a..42eab9a 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 > diff --git a/arch/arm/configs/prima2_defconfig b/arch/arm/configs/prima2_defconfig > index 807d4e2..6a936c7 100644 > --- a/arch/arm/configs/prima2_defconfig > +++ b/arch/arm/configs/prima2_defconfig > @@ -37,7 +37,6 @@ CONFIG_SPI_SIRF=y > CONFIG_SPI_SPIDEV=y > # CONFIG_HWMON is not set > CONFIG_USB_GADGET=y > -CONFIG_USB_FILE_STORAGE=m > CONFIG_USB_MASS_STORAGE=m > CONFIG_MMC=y > CONFIG_MMC_SDHCI=y > diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig > index df77931..2e0419d 100644 > --- a/arch/arm/configs/spitz_defconfig > +++ b/arch/arm/configs/spitz_defconfig > @@ -214,7 +214,7 @@ CONFIG_USB_GADGET_DUMMY_HCD=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_PXA=y > diff --git a/arch/arm/configs/stamp9g20_defconfig b/arch/arm/configs/stamp9g20_defconfig > index 52f1488..b845f55 100644 > --- a/arch/arm/configs/stamp9g20_defconfig > +++ b/arch/arm/configs/stamp9g20_defconfig > @@ -97,7 +97,7 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=m > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_ATMELMCI=y > diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig > index 1d01ddd..d36e0d3 100644 > --- a/arch/arm/configs/viper_defconfig > +++ b/arch/arm/configs/viper_defconfig > @@ -139,7 +139,7 @@ CONFIG_USB_SERIAL_MCT_U232=m > CONFIG_USB_GADGET=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_RTC_CLASS=y > diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig > index 547a3c1..731d4f9 100644 > --- a/arch/arm/configs/zeus_defconfig > +++ b/arch/arm/configs/zeus_defconfig > @@ -143,7 +143,7 @@ CONFIG_USB_GADGET=m > CONFIG_USB_PXA27X=y > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig > index a06bfcc..f4025db 100644 > --- a/arch/avr32/configs/atngw100_defconfig > +++ b/arch/avr32/configs/atngw100_defconfig > @@ -109,7 +109,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig > index d8f1fe8..c76a49b 100644 > --- a/arch/avr32/configs/atngw100_evklcd100_defconfig > +++ b/arch/avr32/configs/atngw100_evklcd100_defconfig > @@ -125,7 +125,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig > index d4c5b19..2d8ab08 100644 > --- a/arch/avr32/configs/atngw100_evklcd101_defconfig > +++ b/arch/avr32/configs/atngw100_evklcd101_defconfig > @@ -124,7 +124,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig > index 77ca4f9..b189e0c 100644 > --- a/arch/avr32/configs/atngw100_mrmt_defconfig > +++ b/arch/avr32/configs/atngw100_mrmt_defconfig > @@ -99,7 +99,7 @@ CONFIG_SND_ATMEL_AC97C=m > # CONFIG_SND_SPI is not set > CONFIG_USB_GADGET=m > CONFIG_USB_GADGET_DEBUG_FILES=y > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_ATMELMCI=y > diff --git a/arch/avr32/configs/atngw100mkii_defconfig b/arch/avr32/configs/atngw100mkii_defconfig > index 6e0dca4..2e4de42 100644 > --- a/arch/avr32/configs/atngw100mkii_defconfig > +++ b/arch/avr32/configs/atngw100mkii_defconfig > @@ -111,7 +111,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig > index 7f2a344..fad3cd2 100644 > --- a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig > +++ b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig > @@ -128,7 +128,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig > index 085eeba..2998623 100644 > --- a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig > +++ b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig > @@ -127,7 +127,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig > index d1a887e..a582465 100644 > --- a/arch/avr32/configs/atstk1002_defconfig > +++ b/arch/avr32/configs/atstk1002_defconfig > @@ -126,7 +126,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig > index 956f281..57a79df 100644 > --- a/arch/avr32/configs/atstk1003_defconfig > +++ b/arch/avr32/configs/atstk1003_defconfig > @@ -105,7 +105,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig > index 40c69f3..1a49bd8 100644 > --- a/arch/avr32/configs/atstk1004_defconfig > +++ b/arch/avr32/configs/atstk1004_defconfig > @@ -104,7 +104,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig > index 511eb8a..206a1b6 100644 > --- a/arch/avr32/configs/atstk1006_defconfig > +++ b/arch/avr32/configs/atstk1006_defconfig > @@ -129,7 +129,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig > index 19973b0..0421498 100644 > --- a/arch/avr32/configs/favr-32_defconfig > +++ b/arch/avr32/configs/favr-32_defconfig > @@ -117,7 +117,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig > index 6f45681..82f24eb 100644 > --- a/arch/avr32/configs/hammerhead_defconfig > +++ b/arch/avr32/configs/hammerhead_defconfig > @@ -127,7 +127,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=m > CONFIG_MMC_ATMELMCI=m > diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig > index c280a50..f59c80e 100644 > --- a/arch/blackfin/configs/CM-BF527_defconfig > +++ b/arch/blackfin/configs/CM-BF527_defconfig > @@ -106,7 +106,7 @@ CONFIG_MUSB_PIO_ONLY=y > CONFIG_USB_STORAGE=m > CONFIG_USB_GADGET=m > CONFIG_USB_ETH=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_RTC_CLASS=y > diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig > index 349922b..e961483 100644 > --- a/arch/blackfin/configs/CM-BF548_defconfig > +++ b/arch/blackfin/configs/CM-BF548_defconfig > @@ -107,7 +107,7 @@ CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > # CONFIG_USB_ETH_RNDIS is not set > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_MMC=m > diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig > index 0456dea..24936b9 100644 > --- a/arch/blackfin/configs/CM-BF561_defconfig > +++ b/arch/blackfin/configs/CM-BF561_defconfig > @@ -83,7 +83,7 @@ CONFIG_GPIOLIB=y > CONFIG_GPIO_SYSFS=y > CONFIG_USB_GADGET=m > CONFIG_USB_ETH=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_MMC=y > diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig > index b6fde2b..4ca8e5c 100644 > --- a/arch/mips/configs/bcm47xx_defconfig > +++ b/arch/mips/configs/bcm47xx_defconfig > @@ -473,7 +473,7 @@ CONFIG_USB_GADGET_NET2280=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_MIDI_GADGET=m > CONFIG_LEDS_CLASS=y > diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig > index 46c61edc..a0277d4 100644 > --- a/arch/mips/configs/mtx1_defconfig > +++ b/arch/mips/configs/mtx1_defconfig > @@ -661,7 +661,7 @@ CONFIG_USB_GADGET_NET2280=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_MIDI_GADGET=m > CONFIG_MMC=m > diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig > index 911e30c9..c6c2bec 100644 > --- a/arch/sh/configs/ecovec24_defconfig > +++ b/arch/sh/configs/ecovec24_defconfig > @@ -112,7 +112,7 @@ CONFIG_USB_MON=y > CONFIG_USB_R8A66597_HCD=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_MMC=y > CONFIG_MMC_SPI=y > CONFIG_MMC_SDHI=y > diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig > index ed35093..1faa788 100644 > --- a/arch/sh/configs/se7724_defconfig > +++ b/arch/sh/configs/se7724_defconfig > @@ -109,7 +109,7 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_SPI=y >
Hi, On Fri, Nov 02, 2012 at 02:31:50PM +0100, Michal Nazarewicz wrote: > From: Michal Nazarewicz <mina86@mina86.com> > > 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> I need more Acks here. Only got one from Nicolas. Anyone else ? > --- > arch/arm/configs/afeb9260_defconfig | 2 +- > arch/arm/configs/at91sam9260_defconfig | 2 +- > arch/arm/configs/at91sam9261_defconfig | 2 +- > arch/arm/configs/at91sam9263_defconfig | 2 +- > arch/arm/configs/at91sam9g20_defconfig | 2 +- > arch/arm/configs/corgi_defconfig | 2 +- > arch/arm/configs/davinci_all_defconfig | 2 +- > arch/arm/configs/h7202_defconfig | 3 +-- > arch/arm/configs/magician_defconfig | 2 +- > arch/arm/configs/mini2440_defconfig | 2 +- > arch/arm/configs/omap1_defconfig | 3 +-- > arch/arm/configs/prima2_defconfig | 1 - > arch/arm/configs/spitz_defconfig | 2 +- > arch/arm/configs/stamp9g20_defconfig | 2 +- > arch/arm/configs/viper_defconfig | 2 +- > arch/arm/configs/zeus_defconfig | 2 +- > arch/avr32/configs/atngw100_defconfig | 2 +- > arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +- > arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +- > arch/avr32/configs/atngw100_mrmt_defconfig | 2 +- > arch/avr32/configs/atngw100mkii_defconfig | 2 +- > .../avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +- > .../avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +- > arch/avr32/configs/atstk1002_defconfig | 2 +- > arch/avr32/configs/atstk1003_defconfig | 2 +- > arch/avr32/configs/atstk1004_defconfig | 2 +- > arch/avr32/configs/atstk1006_defconfig | 2 +- > arch/avr32/configs/favr-32_defconfig | 2 +- > arch/avr32/configs/hammerhead_defconfig | 2 +- > arch/blackfin/configs/CM-BF527_defconfig | 2 +- > arch/blackfin/configs/CM-BF548_defconfig | 2 +- > arch/blackfin/configs/CM-BF561_defconfig | 2 +- > arch/mips/configs/bcm47xx_defconfig | 2 +- > arch/mips/configs/mtx1_defconfig | 2 +- > arch/sh/configs/ecovec24_defconfig | 2 +- > arch/sh/configs/se7724_defconfig | 2 +- > 37 files changed, 35 insertions(+), 39 deletions(-) > > diff --git a/arch/arm/configs/afeb9260_defconfig b/arch/arm/configs/afeb9260_defconfig > index c285a9d..a8dbc1e 100644 > --- a/arch/arm/configs/afeb9260_defconfig > +++ b/arch/arm/configs/afeb9260_defconfig > @@ -79,7 +79,7 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_RTC_CLASS=y > CONFIG_RTC_DEBUG=y > diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig > index 505b376..0ea5d2c 100644 > --- a/arch/arm/configs/at91sam9260_defconfig > +++ b/arch/arm/configs/at91sam9260_defconfig > @@ -75,7 +75,7 @@ CONFIG_USB_STORAGE_DEBUG=y > CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_RTC_CLASS=y > CONFIG_RTC_DRV_AT91SAM9=y > diff --git a/arch/arm/configs/at91sam9261_defconfig b/arch/arm/configs/at91sam9261_defconfig > index 1e8712e..c87beb9 100644 > --- a/arch/arm/configs/at91sam9261_defconfig > +++ b/arch/arm/configs/at91sam9261_defconfig > @@ -125,7 +125,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_ATMELMCI=m > diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig > index d2050ca..c5212f4 100644 > --- a/arch/arm/configs/at91sam9263_defconfig > +++ b/arch/arm/configs/at91sam9263_defconfig > @@ -133,7 +133,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_SDIO_UART=m > diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig > index e1b0e80..3b18810 100644 > --- a/arch/arm/configs/at91sam9g20_defconfig > +++ b/arch/arm/configs/at91sam9g20_defconfig > @@ -96,7 +96,7 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_ATMELMCI=m > diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig > index 4b8a25d..1fd1d1d 100644 > --- a/arch/arm/configs/corgi_defconfig > +++ b/arch/arm/configs/corgi_defconfig > @@ -218,7 +218,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_PXA=y > diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig > index 67b5abb6..4ea7c95 100644 > --- a/arch/arm/configs/davinci_all_defconfig > +++ b/arch/arm/configs/davinci_all_defconfig > @@ -144,7 +144,7 @@ CONFIG_USB_GADGET_DEBUG_FS=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_USB_CDC_COMPOSITE=m > diff --git a/arch/arm/configs/h7202_defconfig b/arch/arm/configs/h7202_defconfig > index 69405a7..e16d3f3 100644 > --- a/arch/arm/configs/h7202_defconfig > +++ b/arch/arm/configs/h7202_defconfig > @@ -34,8 +34,7 @@ CONFIG_FB_MODE_HELPERS=y > CONFIG_USB_GADGET=m > CONFIG_USB_ZERO=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > -CONFIG_USB_FILE_STORAGE_TEST=y > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_EXT2_FS=y > CONFIG_TMPFS=y > diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig > index a691ef4..557dd29 100644 > --- a/arch/arm/configs/magician_defconfig > +++ b/arch/arm/configs/magician_defconfig > @@ -136,7 +136,7 @@ CONFIG_USB_PXA27X=y > CONFIG_USB_ETH=m > # CONFIG_USB_ETH_RNDIS is not set > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_USB_GPIO_VBUS=y > diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig > index 00630e6..a07948a 100644 > --- a/arch/arm/configs/mini2440_defconfig > +++ b/arch/arm/configs/mini2440_defconfig > @@ -240,7 +240,7 @@ CONFIG_USB_GADGET_S3C2410=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig > index dde2a1a..42eab9a 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 > diff --git a/arch/arm/configs/prima2_defconfig b/arch/arm/configs/prima2_defconfig > index 807d4e2..6a936c7 100644 > --- a/arch/arm/configs/prima2_defconfig > +++ b/arch/arm/configs/prima2_defconfig > @@ -37,7 +37,6 @@ CONFIG_SPI_SIRF=y > CONFIG_SPI_SPIDEV=y > # CONFIG_HWMON is not set > CONFIG_USB_GADGET=y > -CONFIG_USB_FILE_STORAGE=m > CONFIG_USB_MASS_STORAGE=m > CONFIG_MMC=y > CONFIG_MMC_SDHCI=y > diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig > index df77931..2e0419d 100644 > --- a/arch/arm/configs/spitz_defconfig > +++ b/arch/arm/configs/spitz_defconfig > @@ -214,7 +214,7 @@ CONFIG_USB_GADGET_DUMMY_HCD=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_PXA=y > diff --git a/arch/arm/configs/stamp9g20_defconfig b/arch/arm/configs/stamp9g20_defconfig > index 52f1488..b845f55 100644 > --- a/arch/arm/configs/stamp9g20_defconfig > +++ b/arch/arm/configs/stamp9g20_defconfig > @@ -97,7 +97,7 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=m > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_ATMELMCI=y > diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig > index 1d01ddd..d36e0d3 100644 > --- a/arch/arm/configs/viper_defconfig > +++ b/arch/arm/configs/viper_defconfig > @@ -139,7 +139,7 @@ CONFIG_USB_SERIAL_MCT_U232=m > CONFIG_USB_GADGET=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_RTC_CLASS=y > diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig > index 547a3c1..731d4f9 100644 > --- a/arch/arm/configs/zeus_defconfig > +++ b/arch/arm/configs/zeus_defconfig > @@ -143,7 +143,7 @@ CONFIG_USB_GADGET=m > CONFIG_USB_PXA27X=y > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig > index a06bfcc..f4025db 100644 > --- a/arch/avr32/configs/atngw100_defconfig > +++ b/arch/avr32/configs/atngw100_defconfig > @@ -109,7 +109,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig > index d8f1fe8..c76a49b 100644 > --- a/arch/avr32/configs/atngw100_evklcd100_defconfig > +++ b/arch/avr32/configs/atngw100_evklcd100_defconfig > @@ -125,7 +125,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig > index d4c5b19..2d8ab08 100644 > --- a/arch/avr32/configs/atngw100_evklcd101_defconfig > +++ b/arch/avr32/configs/atngw100_evklcd101_defconfig > @@ -124,7 +124,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig > index 77ca4f9..b189e0c 100644 > --- a/arch/avr32/configs/atngw100_mrmt_defconfig > +++ b/arch/avr32/configs/atngw100_mrmt_defconfig > @@ -99,7 +99,7 @@ CONFIG_SND_ATMEL_AC97C=m > # CONFIG_SND_SPI is not set > CONFIG_USB_GADGET=m > CONFIG_USB_GADGET_DEBUG_FILES=y > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_ATMELMCI=y > diff --git a/arch/avr32/configs/atngw100mkii_defconfig b/arch/avr32/configs/atngw100mkii_defconfig > index 6e0dca4..2e4de42 100644 > --- a/arch/avr32/configs/atngw100mkii_defconfig > +++ b/arch/avr32/configs/atngw100mkii_defconfig > @@ -111,7 +111,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig > index 7f2a344..fad3cd2 100644 > --- a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig > +++ b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig > @@ -128,7 +128,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig > index 085eeba..2998623 100644 > --- a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig > +++ b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig > @@ -127,7 +127,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig > index d1a887e..a582465 100644 > --- a/arch/avr32/configs/atstk1002_defconfig > +++ b/arch/avr32/configs/atstk1002_defconfig > @@ -126,7 +126,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig > index 956f281..57a79df 100644 > --- a/arch/avr32/configs/atstk1003_defconfig > +++ b/arch/avr32/configs/atstk1003_defconfig > @@ -105,7 +105,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig > index 40c69f3..1a49bd8 100644 > --- a/arch/avr32/configs/atstk1004_defconfig > +++ b/arch/avr32/configs/atstk1004_defconfig > @@ -104,7 +104,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig > index 511eb8a..206a1b6 100644 > --- a/arch/avr32/configs/atstk1006_defconfig > +++ b/arch/avr32/configs/atstk1006_defconfig > @@ -129,7 +129,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig > index 19973b0..0421498 100644 > --- a/arch/avr32/configs/favr-32_defconfig > +++ b/arch/avr32/configs/favr-32_defconfig > @@ -117,7 +117,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_CDC_COMPOSITE=m > CONFIG_MMC=y > diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig > index 6f45681..82f24eb 100644 > --- a/arch/avr32/configs/hammerhead_defconfig > +++ b/arch/avr32/configs/hammerhead_defconfig > @@ -127,7 +127,7 @@ CONFIG_USB_GADGET=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=m > CONFIG_MMC_ATMELMCI=m > diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig > index c280a50..f59c80e 100644 > --- a/arch/blackfin/configs/CM-BF527_defconfig > +++ b/arch/blackfin/configs/CM-BF527_defconfig > @@ -106,7 +106,7 @@ CONFIG_MUSB_PIO_ONLY=y > CONFIG_USB_STORAGE=m > CONFIG_USB_GADGET=m > CONFIG_USB_ETH=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_RTC_CLASS=y > diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig > index 349922b..e961483 100644 > --- a/arch/blackfin/configs/CM-BF548_defconfig > +++ b/arch/blackfin/configs/CM-BF548_defconfig > @@ -107,7 +107,7 @@ CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > # CONFIG_USB_ETH_RNDIS is not set > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_MMC=m > diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig > index 0456dea..24936b9 100644 > --- a/arch/blackfin/configs/CM-BF561_defconfig > +++ b/arch/blackfin/configs/CM-BF561_defconfig > @@ -83,7 +83,7 @@ CONFIG_GPIOLIB=y > CONFIG_GPIO_SYSFS=y > CONFIG_USB_GADGET=m > CONFIG_USB_ETH=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_G_PRINTER=m > CONFIG_MMC=y > diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig > index b6fde2b..4ca8e5c 100644 > --- a/arch/mips/configs/bcm47xx_defconfig > +++ b/arch/mips/configs/bcm47xx_defconfig > @@ -473,7 +473,7 @@ CONFIG_USB_GADGET_NET2280=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_MIDI_GADGET=m > CONFIG_LEDS_CLASS=y > diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig > index 46c61edc..a0277d4 100644 > --- a/arch/mips/configs/mtx1_defconfig > +++ b/arch/mips/configs/mtx1_defconfig > @@ -661,7 +661,7 @@ CONFIG_USB_GADGET_NET2280=y > CONFIG_USB_ZERO=m > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_USB_MIDI_GADGET=m > CONFIG_MMC=m > diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig > index 911e30c9..c6c2bec 100644 > --- a/arch/sh/configs/ecovec24_defconfig > +++ b/arch/sh/configs/ecovec24_defconfig > @@ -112,7 +112,7 @@ CONFIG_USB_MON=y > CONFIG_USB_R8A66597_HCD=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_MMC=y > CONFIG_MMC_SPI=y > CONFIG_MMC_SDHI=y > diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig > index ed35093..1faa788 100644 > --- a/arch/sh/configs/se7724_defconfig > +++ b/arch/sh/configs/se7724_defconfig > @@ -109,7 +109,7 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_ETH=m > CONFIG_USB_GADGETFS=m > -CONFIG_USB_FILE_STORAGE=m > +CONFIG_USB_MASS_STORAGE=m > CONFIG_USB_G_SERIAL=m > CONFIG_MMC=y > CONFIG_MMC_SPI=y > -- > 1.7.7.3 >
* Felipe Balbi <balbi@ti.com> [121106 03:40]: > Hi, > > On Fri, Nov 02, 2012 at 02:31:50PM +0100, Michal Nazarewicz wrote: > > From: Michal Nazarewicz <mina86@mina86.com> > > > > 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> > > I need more Acks here. Only got one from Nicolas. Anyone else ? For omaps: Acked-by: Tony Lindgren <tony@atomide.com>
* Tony Lindgren <tony@atomide.com> [121106 10:41]: > * Felipe Balbi <balbi@ti.com> [121106 03:40]: > > Hi, > > > > On Fri, Nov 02, 2012 at 02:31:50PM +0100, Michal Nazarewicz wrote: > > > From: Michal Nazarewicz <mina86@mina86.com> > > > > > > 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> > > > > I need more Acks here. Only got one from Nicolas. Anyone else ? > > For omaps: > > Acked-by: Tony Lindgren <tony@atomide.com> Heh I guess no omap changes there, so probably not worth adding then. Tony
Hi, On Tue, Nov 06, 2012 at 10:42:27AM -0800, Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [121106 10:41]: > > * Felipe Balbi <balbi@ti.com> [121106 03:40]: > > > Hi, > > > > > > On Fri, Nov 02, 2012 at 02:31:50PM +0100, Michal Nazarewicz wrote: > > > > From: Michal Nazarewicz <mina86@mina86.com> > > > > > > > > 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> > > > > > > I need more Acks here. Only got one from Nicolas. Anyone else ? > > > > For omaps: > > > > Acked-by: Tony Lindgren <tony@atomide.com> > > Heh I guess no omap changes there, so probably not > worth adding then. omap1 is old, but it's still omap :-) arch/arm/configs/omap1_defconfig | 3 +--
* Felipe Balbi <balbi@ti.com> [121106 12:40]: > Hi, > > On Tue, Nov 06, 2012 at 10:42:27AM -0800, Tony Lindgren wrote: > > * Tony Lindgren <tony@atomide.com> [121106 10:41]: > > > * Felipe Balbi <balbi@ti.com> [121106 03:40]: > > > > Hi, > > > > > > > > On Fri, Nov 02, 2012 at 02:31:50PM +0100, Michal Nazarewicz wrote: > > > > > From: Michal Nazarewicz <mina86@mina86.com> > > > > > > > > > > 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> > > > > > > > > I need more Acks here. Only got one from Nicolas. Anyone else ? > > > > > > For omaps: > > > > > > Acked-by: Tony Lindgren <tony@atomide.com> > > > > Heh I guess no omap changes there, so probably not > > worth adding then. > > omap1 is old, but it's still omap :-) > > arch/arm/configs/omap1_defconfig | 3 +-- Oh OK so it was not a spurious ack after all :) Tony
diff --git a/arch/arm/configs/afeb9260_defconfig b/arch/arm/configs/afeb9260_defconfig index c285a9d..a8dbc1e 100644 --- a/arch/arm/configs/afeb9260_defconfig +++ b/arch/arm/configs/afeb9260_defconfig @@ -79,7 +79,7 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_RTC_CLASS=y CONFIG_RTC_DEBUG=y diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig index 505b376..0ea5d2c 100644 --- a/arch/arm/configs/at91sam9260_defconfig +++ b/arch/arm/configs/at91sam9260_defconfig @@ -75,7 +75,7 @@ CONFIG_USB_STORAGE_DEBUG=y CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_AT91SAM9=y diff --git a/arch/arm/configs/at91sam9261_defconfig b/arch/arm/configs/at91sam9261_defconfig index 1e8712e..c87beb9 100644 --- a/arch/arm/configs/at91sam9261_defconfig +++ b/arch/arm/configs/at91sam9261_defconfig @@ -125,7 +125,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_ATMELMCI=m diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig index d2050ca..c5212f4 100644 --- a/arch/arm/configs/at91sam9263_defconfig +++ b/arch/arm/configs/at91sam9263_defconfig @@ -133,7 +133,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_SDIO_UART=m diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig index e1b0e80..3b18810 100644 --- a/arch/arm/configs/at91sam9g20_defconfig +++ b/arch/arm/configs/at91sam9g20_defconfig @@ -96,7 +96,7 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_ATMELMCI=m diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index 4b8a25d..1fd1d1d 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig @@ -218,7 +218,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_PXA=y diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 67b5abb6..4ea7c95 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -144,7 +144,7 @@ CONFIG_USB_GADGET_DEBUG_FS=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_G_PRINTER=m CONFIG_USB_CDC_COMPOSITE=m diff --git a/arch/arm/configs/h7202_defconfig b/arch/arm/configs/h7202_defconfig index 69405a7..e16d3f3 100644 --- a/arch/arm/configs/h7202_defconfig +++ b/arch/arm/configs/h7202_defconfig @@ -34,8 +34,7 @@ CONFIG_FB_MODE_HELPERS=y CONFIG_USB_GADGET=m CONFIG_USB_ZERO=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_FILE_STORAGE_TEST=y +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_EXT2_FS=y CONFIG_TMPFS=y diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index a691ef4..557dd29 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig @@ -136,7 +136,7 @@ CONFIG_USB_PXA27X=y CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_USB_GPIO_VBUS=y diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index 00630e6..a07948a 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig @@ -240,7 +240,7 @@ CONFIG_USB_GADGET_S3C2410=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig index dde2a1a..42eab9a 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 diff --git a/arch/arm/configs/prima2_defconfig b/arch/arm/configs/prima2_defconfig index 807d4e2..6a936c7 100644 --- a/arch/arm/configs/prima2_defconfig +++ b/arch/arm/configs/prima2_defconfig @@ -37,7 +37,6 @@ CONFIG_SPI_SIRF=y CONFIG_SPI_SPIDEV=y # CONFIG_HWMON is not set CONFIG_USB_GADGET=y -CONFIG_USB_FILE_STORAGE=m CONFIG_USB_MASS_STORAGE=m CONFIG_MMC=y CONFIG_MMC_SDHCI=y diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index df77931..2e0419d 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig @@ -214,7 +214,7 @@ CONFIG_USB_GADGET_DUMMY_HCD=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_PXA=y diff --git a/arch/arm/configs/stamp9g20_defconfig b/arch/arm/configs/stamp9g20_defconfig index 52f1488..b845f55 100644 --- a/arch/arm/configs/stamp9g20_defconfig +++ b/arch/arm/configs/stamp9g20_defconfig @@ -97,7 +97,7 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=m CONFIG_USB_ZERO=m CONFIG_USB_ETH=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index 1d01ddd..d36e0d3 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig @@ -139,7 +139,7 @@ CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_GADGET=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_G_PRINTER=m CONFIG_RTC_CLASS=y diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig index 547a3c1..731d4f9 100644 --- a/arch/arm/configs/zeus_defconfig +++ b/arch/arm/configs/zeus_defconfig @@ -143,7 +143,7 @@ CONFIG_USB_GADGET=m CONFIG_USB_PXA27X=y CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_G_PRINTER=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig index a06bfcc..f4025db 100644 --- a/arch/avr32/configs/atngw100_defconfig +++ b/arch/avr32/configs/atngw100_defconfig @@ -109,7 +109,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig index d8f1fe8..c76a49b 100644 --- a/arch/avr32/configs/atngw100_evklcd100_defconfig +++ b/arch/avr32/configs/atngw100_evklcd100_defconfig @@ -125,7 +125,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig index d4c5b19..2d8ab08 100644 --- a/arch/avr32/configs/atngw100_evklcd101_defconfig +++ b/arch/avr32/configs/atngw100_evklcd101_defconfig @@ -124,7 +124,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig index 77ca4f9..b189e0c 100644 --- a/arch/avr32/configs/atngw100_mrmt_defconfig +++ b/arch/avr32/configs/atngw100_mrmt_defconfig @@ -99,7 +99,7 @@ CONFIG_SND_ATMEL_AC97C=m # CONFIG_SND_SPI is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_DEBUG_FILES=y -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y diff --git a/arch/avr32/configs/atngw100mkii_defconfig b/arch/avr32/configs/atngw100mkii_defconfig index 6e0dca4..2e4de42 100644 --- a/arch/avr32/configs/atngw100mkii_defconfig +++ b/arch/avr32/configs/atngw100mkii_defconfig @@ -111,7 +111,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig index 7f2a344..fad3cd2 100644 --- a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig +++ b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig @@ -128,7 +128,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig index 085eeba..2998623 100644 --- a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig +++ b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig @@ -127,7 +127,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=350 CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig index d1a887e..a582465 100644 --- a/arch/avr32/configs/atstk1002_defconfig +++ b/arch/avr32/configs/atstk1002_defconfig @@ -126,7 +126,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig index 956f281..57a79df 100644 --- a/arch/avr32/configs/atstk1003_defconfig +++ b/arch/avr32/configs/atstk1003_defconfig @@ -105,7 +105,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig index 40c69f3..1a49bd8 100644 --- a/arch/avr32/configs/atstk1004_defconfig +++ b/arch/avr32/configs/atstk1004_defconfig @@ -104,7 +104,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig index 511eb8a..206a1b6 100644 --- a/arch/avr32/configs/atstk1006_defconfig +++ b/arch/avr32/configs/atstk1006_defconfig @@ -129,7 +129,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig index 19973b0..0421498 100644 --- a/arch/avr32/configs/favr-32_defconfig +++ b/arch/avr32/configs/favr-32_defconfig @@ -117,7 +117,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig index 6f45681..82f24eb 100644 --- a/arch/avr32/configs/hammerhead_defconfig +++ b/arch/avr32/configs/hammerhead_defconfig @@ -127,7 +127,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=m CONFIG_MMC_ATMELMCI=m diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig index c280a50..f59c80e 100644 --- a/arch/blackfin/configs/CM-BF527_defconfig +++ b/arch/blackfin/configs/CM-BF527_defconfig @@ -106,7 +106,7 @@ CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_STORAGE=m CONFIG_USB_GADGET=m CONFIG_USB_ETH=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_G_PRINTER=m CONFIG_RTC_CLASS=y diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig index 349922b..e961483 100644 --- a/arch/blackfin/configs/CM-BF548_defconfig +++ b/arch/blackfin/configs/CM-BF548_defconfig @@ -107,7 +107,7 @@ CONFIG_USB_ZERO=m CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_G_PRINTER=m CONFIG_MMC=m diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig index 0456dea..24936b9 100644 --- a/arch/blackfin/configs/CM-BF561_defconfig +++ b/arch/blackfin/configs/CM-BF561_defconfig @@ -83,7 +83,7 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_USB_GADGET=m CONFIG_USB_ETH=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_G_PRINTER=m CONFIG_MMC=y diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig index b6fde2b..4ca8e5c 100644 --- a/arch/mips/configs/bcm47xx_defconfig +++ b/arch/mips/configs/bcm47xx_defconfig @@ -473,7 +473,7 @@ CONFIG_USB_GADGET_NET2280=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m CONFIG_LEDS_CLASS=y diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index 46c61edc..a0277d4 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig @@ -661,7 +661,7 @@ CONFIG_USB_GADGET_NET2280=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m CONFIG_MMC=m diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig index 911e30c9..c6c2bec 100644 --- a/arch/sh/configs/ecovec24_defconfig +++ b/arch/sh/configs/ecovec24_defconfig @@ -112,7 +112,7 @@ CONFIG_USB_MON=y CONFIG_USB_R8A66597_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_MMC=y CONFIG_MMC_SPI=y CONFIG_MMC_SDHI=y diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig index ed35093..1faa788 100644 --- a/arch/sh/configs/se7724_defconfig +++ b/arch/sh/configs/se7724_defconfig @@ -109,7 +109,7 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_SPI=y