summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imote2_defconfig
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2011-11-09 23:13:07 (GMT)
committerEric Miao <eric.y.miao@gmail.com>2011-11-10 07:32:27 (GMT)
commitc0a39151a4055332897cba615623d3de2f3896df (patch)
tree028950ddec3536be27dbd0da94248fbf59838e4a /arch/arm/configs/imote2_defconfig
parent1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff)
downloadlinux-c0a39151a4055332897cba615623d3de2f3896df.tar.xz
ARM: pxa: fix inconsistent CONFIG_USB_PXA27X
Since CONFIG_USB_GADGET_PXA27X and other macros are renamed to CONFIG_USB_PXA27X. Update them in arch/arm/mach-pxa and arch/arm/configs to keep consistent. Cc: stable@kernel.org Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/configs/imote2_defconfig')
-rw-r--r--arch/arm/configs/imote2_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig
index 176ec22..fd996bb 100644
--- a/arch/arm/configs/imote2_defconfig
+++ b/arch/arm/configs/imote2_defconfig
@@ -263,7 +263,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