diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-10 07:13:07 +0800 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-11-10 15:32:27 +0800 |
| commit | c0a39151a4055332897cba615623d3de2f3896df (patch) | |
| tree | 028950ddec3536be27dbd0da94248fbf59838e4a /arch/arm/mach-pxa/colibri-pxa320.c | |
| parent | 1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff) | |
| download | talos-op-linux-c0a39151a4055332897cba615623d3de2f3896df.tar.gz talos-op-linux-c0a39151a4055332897cba615623d3de2f3896df.zip | |
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>
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa320.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa320.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index 692e1ffc5586..d23b92b80488 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c @@ -146,7 +146,7 @@ static void __init colibri_pxa320_init_eth(void) static inline void __init colibri_pxa320_init_eth(void) {} #endif /* CONFIG_AX88796 */ -#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) +#if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE) static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = { .gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96), .gpio_pullup = -1, |
