diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 00:30:08 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 00:30:08 +0400 |
| commit | 56f54e7d671969da13693e5a147438f2cc50ca9b (patch) | |
| tree | 888fa7296d34d26354ae20e8391dac880406d942 /arch/arm/configs | |
| parent | d92c9d5b38cd2932de463df1afa7a67fbf9207ef (diff) | |
| parent | e4b3bbe31d9a1e9540c6e9c95f5e7fd92acbcacf (diff) | |
| download | linux-56f54e7d671969da13693e5a147438f2cc50ca9b.tar.xz | |
Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/ezx_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/imote2_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/magician_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/zeus_defconfig | 2 |
4 files changed, 4 insertions, 4 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 diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index 176ec22af034..fd996bb13022 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 diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index a88e64d4e9a5..443675d317e6 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig @@ -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 diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig index 59577ad3f4ef..547a3c1e59db 100644 --- a/arch/arm/configs/zeus_defconfig +++ b/arch/arm/configs/zeus_defconfig @@ -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 |