summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/gumstix.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-14 20:02:09 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-14 20:02:09 +0800
commit704867ede0c3645075ff3438d1a4fd4977abaa8d (patch)
treefc89b31764132dc1b07e0af3e53219005cfb8f95 /arch/arm/mach-pxa/gumstix.c
parent681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25 (diff)
parentcfe04478fa1b472264b7fe9bbf547710aa344d3c (diff)
Merge branch 'mfd/da9052' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into regmap-next
Diffstat (limited to 'arch/arm/mach-pxa/gumstix.c')
-rw-r--r--arch/arm/mach-pxa/gumstix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index 9c8208ca0415..ffdd70dad327 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -106,7 +106,7 @@ static void __init gumstix_mmc_init(void)
}
#endif
-#ifdef CONFIG_USB_GADGET_PXA25X
+#ifdef CONFIG_USB_PXA25X
static struct gpio_vbus_mach_info gumstix_udc_info = {
.gpio_vbus = GPIO_GUMSTIX_USB_GPIOn,
.gpio_pullup = GPIO_GUMSTIX_USB_GPIOx,