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

Commit 56f54e7d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes

parents d92c9d5b e4b3bbe3

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-mmp/gplugd.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void __init gplugd_init(void) 


	/* on-chip devices */

	pxa168_add_uart(3);

	pxa168_add_ssp(0);

	pxa168_add_ssp(1);

	pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(gplugd_i2c_board_info));



	pxa168_add_eth(&gplugd_eth_platform_data);