commit c0a39151a4055332897cba615623d3de2f3896df
author Haojian Zhuang <haojian.zhuang@marvell.com> Thu Nov 10 07:13:07 2011 +0800
committer Eric Miao <eric.y.miao@gmail.com> Thu Nov 10 15:32:27 2011 +0800
tree 028950ddec3536be27dbd0da94248fbf59838e4a
parent 1ea6b8f48918282bdca0b32a34095504ee65bab5

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>

arch/arm/configs/magician_defconfig

diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index a88e64d..443675d 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -132,7 +132,7 @@
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=y
 CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_RNDIS is not set
 CONFIG_USB_GADGETFS=m