summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/ezx_defconfig
diff options
context:
space:
mode:
authorDavid S. Miller2011-12-02 19:49:21 +0100
committerDavid S. Miller2011-12-02 19:49:21 +0100
commitb3613118eb30a589d971e4eccbbb2a1314f5dfd4 (patch)
tree868c1ee59e1b5c19a4f2e43716400d0001a994e5 /arch/arm/configs/ezx_defconfig
parentforcedeath: Fix bql support for forcedeath (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadkernel-qcow2-linux-b3613118eb30a589d971e4eccbbb2a1314f5dfd4.tar.gz
kernel-qcow2-linux-b3613118eb30a589d971e4eccbbb2a1314f5dfd4.tar.xz
kernel-qcow2-linux-b3613118eb30a589d971e4eccbbb2a1314f5dfd4.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/configs/ezx_defconfig')
-rw-r--r--arch/arm/configs/ezx_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig
index 227a477346ed..d95763d5f0d8 100644
--- a/arch/arm/configs/ezx_defconfig
+++ b/arch/arm/configs/ezx_defconfig
@@ -287,7 +287,7 @@ CONFIG_USB=y
# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=y
CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set
CONFIG_MMC=y