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/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
palmt5.h
diff --git
a/arch/arm/mach-pxa/include/mach/palmt5.h
b/arch/arm/mach-pxa/include/mach/palmt5.h
index
052bfe7
..
d15662a
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/palmt5.h
+++ b/
arch/arm/mach-pxa/include/mach/palmt5.h
@@
-37,7
+37,6
@@
/* USB */
#define GPIO_NR_PALMT5_USB_DETECT_N 15
/* USB */
#define GPIO_NR_PALMT5_USB_DETECT_N 15
-#define GPIO_NR_PALMT5_USB_POWER 95
#define GPIO_NR_PALMT5_USB_PULLUP 93
/* LCD/BACKLIGHT */
#define GPIO_NR_PALMT5_USB_PULLUP 93
/* LCD/BACKLIGHT */