diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-09 18:13:07 -0500 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-11-10 02:32:27 -0500 |
| commit | c0a39151a4055332897cba615623d3de2f3896df (patch) | |
| tree | 028950ddec3536be27dbd0da94248fbf59838e4a /arch/arm/mach-pxa/palmtc.c | |
| parent | 1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff) | |
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/palmtc.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c index 6ec7caefb37c..2c24c67fd92b 100644 --- a/arch/arm/mach-pxa/palmtc.c +++ b/arch/arm/mach-pxa/palmtc.c | |||
| @@ -338,7 +338,7 @@ static inline void palmtc_mkp_init(void) {} | |||
| 338 | /****************************************************************************** | 338 | /****************************************************************************** |
| 339 | * UDC | 339 | * UDC |
| 340 | ******************************************************************************/ | 340 | ******************************************************************************/ |
| 341 | #if defined(CONFIG_USB_GADGET_PXA25X)||defined(CONFIG_USB_GADGET_PXA25X_MODULE) | 341 | #if defined(CONFIG_USB_PXA25X)||defined(CONFIG_USB_PXA25X_MODULE) |
| 342 | static struct gpio_vbus_mach_info palmtc_udc_info = { | 342 | static struct gpio_vbus_mach_info palmtc_udc_info = { |
| 343 | .gpio_vbus = GPIO_NR_PALMTC_USB_DETECT_N, | 343 | .gpio_vbus = GPIO_NR_PALMTC_USB_DETECT_N, |
| 344 | .gpio_vbus_inverted = 1, | 344 | .gpio_vbus_inverted = 1, |