summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/vpac270.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-06 14:23:35 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-06 14:23:35 +0000
commit3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch)
treee687c88b1b66ad51a6a6c529f7f328f2d3b625fa /arch/arm/mach-pxa/vpac270.c
parent58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (diff)
parentb07fed455c883f07f8e847f5b0d79975b4dc8e7a (diff)
downloadop-kernel-dev-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.zip
op-kernel-dev-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.tar.gz
Merge branch 'mxs/saif' into next/drivers
Conflicts: drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'arch/arm/mach-pxa/vpac270.c')
-rw-r--r--arch/arm/mach-pxa/vpac270.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index bf2403c..9edeec6 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -343,7 +343,7 @@ static inline void vpac270_uhc_init(void) {}
/******************************************************************************
* USB Gadget
******************************************************************************/
-#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 vpac270_gpio_vbus_info = {
.gpio_vbus = GPIO41_VPAC270_UDC_DETECT,
.gpio_pullup = -1,
OpenPOWER on IntegriCloud