aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-15 14:55:17 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-21 13:26:04 -0400
commit419606ec4d42a37a8b688bb55fee99434ad6954c (patch)
tree953dda17e7f38a5c1ca6737ffaa2375b49982af7
parent1ced9a5b07ccf41704ca347778a154944598c665 (diff)
ARM: pxa: remove broken balloon3_gpio_vbus reference
balloon3_udc_init() tries to register a balloon3_gpio_vbus device, but this has never been defined in the mainline kernel. To avoid the obvious build failure when this function is enabled, remove the bogus reference here. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Daniel Mack <zonque@gmail.com>
-rw-r--r--arch/arm/mach-pxa/balloon3.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 2f71b3fbd319..43596e0ed051 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -331,7 +331,6 @@ static struct pxa2xx_udc_mach_info balloon3_udc_info __initdata = {
331static void __init balloon3_udc_init(void) 331static void __init balloon3_udc_init(void)
332{ 332{
333 pxa_set_udc_info(&balloon3_udc_info); 333 pxa_set_udc_info(&balloon3_udc_info);
334 platform_device_register(&balloon3_gpio_vbus);
335} 334}
336#else 335#else
337static inline void balloon3_udc_init(void) {} 336static inline void balloon3_udc_init(void) {}