diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-10 07:13:07 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 08:52:24 -0800 |
| commit | bfbcb8185dfbb5a9ecaa09bb816a96740e104c0f (patch) | |
| tree | eaa54ee9671c130d68f3d1a494d8cdd22cdbe13a /arch/arm/configs/zeus_defconfig | |
| parent | 47b52de3faa57f5849c71bdaee4cd041debcc1ff (diff) | |
| download | kernel_samsung_smdk4412-bfbcb8185dfbb5a9ecaa09bb816a96740e104c0f.zip kernel_samsung_smdk4412-bfbcb8185dfbb5a9ecaa09bb816a96740e104c0f.tar.gz kernel_samsung_smdk4412-bfbcb8185dfbb5a9ecaa09bb816a96740e104c0f.tar.bz2 | |
ARM: pxa: fix inconsistent CONFIG_USB_PXA27X
commit c0a39151a4055332897cba615623d3de2f3896df upstream.
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.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/configs/zeus_defconfig')
| -rw-r--r-- | arch/arm/configs/zeus_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig index 59577ad..547a3c1 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 |