diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:30:08 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:30:08 +0000 |
| commit | 56f54e7d671969da13693e5a147438f2cc50ca9b (patch) | |
| tree | 888fa7296d34d26354ae20e8391dac880406d942 /arch/arm/mach-pxa/palmtc.c | |
| parent | d92c9d5b38cd2932de463df1afa7a67fbf9207ef (diff) | |
| parent | e4b3bbe31d9a1e9540c6e9c95f5e7fd92acbcacf (diff) | |
Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes
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) {} /****************************************************************************** * UDC ******************************************************************************/ -#if defined(CONFIG_USB_GADGET_PXA25X)||defined(CONFIG_USB_GADGET_PXA25X_MODULE) +#if defined(CONFIG_USB_PXA25X)||defined(CONFIG_USB_PXA25X_MODULE) static struct gpio_vbus_mach_info palmtc_udc_info = { .gpio_vbus = GPIO_NR_PALMTC_USB_DETECT_N, .gpio_vbus_inverted = 1, |