git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
palm27x.h
diff --git
a/arch/arm/mach-pxa/include/mach/palm27x.h
b/arch/arm/mach-pxa/include/mach/palm27x.h
index
f80bbe2
..
d4eac3d
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/palm27x.h
+++ b/
arch/arm/mach-pxa/include/mach/palm27x.h
@@
-37,8
+37,8
@@
extern void __init palm27x_lcd_init(int power,
#define palm27x_lcd_init(power, mode) do {} while (0)
#endif
#define palm27x_lcd_init(power, mode) do {} while (0)
#endif
-#if defined(CONFIG_USB_
GADGET_
PXA27X) || \
- defined(CONFIG_USB_
GADGET_
PXA27X_MODULE)
+#if defined(CONFIG_USB_PXA27X) || \
+ defined(CONFIG_USB_PXA27X_MODULE)
extern void __init palm27x_udc_init(int vbus, int pullup,
int vbus_inverted);
#else
extern void __init palm27x_udc_init(int vbus, int pullup,
int vbus_inverted);
#else