diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-03-31 18:10:34 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2013-03-31 18:10:34 +0200 |
| commit | 70711d223510ba1773cfe1d7770a56141c815ff8 (patch) | |
| tree | 4a71f38a3a554ddecaa31b7d8c6bc49b7d1705b4 /arch/arm/configs/corgi_defconfig | |
| parent | d53b4ed072d9779cdf53582c46436dec06d0961f (diff) | |
| parent | 19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff) | |
Merge tag 'v3.8' of /home/kaber/src/repos/linux
Linux 3.8
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/linux/Kbuild
include/linux/netlink.h
Diffstat (limited to 'arch/arm/configs/corgi_defconfig')
| -rw-r--r-- | arch/arm/configs/corgi_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index e53c4756384..1fd1d1de322 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig @@ -97,7 +97,6 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_SHARPSL=y CONFIG_BLK_DEV_LOOP=y CONFIG_IDE=y @@ -219,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 |