Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0a39151 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Eric Miao
Browse files

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: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 1ea6b8f4

arch/arm/configs/ezx_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/imote2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/magician_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ CONFIG_USB_MON=m 
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

arch/arm/configs/zeus_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ CONFIG_USB_SERIAL=m 
CONFIG_USB_SERIAL_GENERIC=y

CONFIG_USB_SERIAL_MCT_U232=m

CONFIG_USB_GADGET=m

CONFIG_USB_GADGET_PXA27X=y

CONFIG_USB_PXA27X=y

CONFIG_USB_ETH=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_FILE_STORAGE=m

arch/arm/mach-pxa/balloon3.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static inline void balloon3_mmc_init(void) {} 
/******************************************************************************

 * USB Gadget

 ******************************************************************************/

#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE)

#if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE)

static void balloon3_udc_command(int cmd)

{

	if (cmd == PXA2XX_UDC_CMD_CONNECT)