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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
spitz.c
diff --git
a/arch/arm/mach-pxa/spitz.c
b/arch/arm/mach-pxa/spitz.c
index
19b5109
..
01bdd75
100644
(file)
--- a/
arch/arm/mach-pxa/spitz.c
+++ b/
arch/arm/mach-pxa/spitz.c
@@
-363,7
+363,7
@@
static struct gpio_keys_button spitz_gpio_keys[] = {
.type = EV_PWR,
.code = KEY_SUSPEND,
.gpio = SPITZ_GPIO_ON_KEY,
- .desc = "On
/
Off",
+ .desc = "On
Off",
.wakeup = 1,
},
/* Two buttons detecting the lid state */