diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-05-13 18:19:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-05-13 18:19:32 -0400 |
| commit | baa456331738b4e76a92318b62b354377a30ad80 (patch) | |
| tree | 75c828a7c8a9f1b5f7f41b2e53271eafb7e561ef /arch/arm/mach-pxa/spitz.c | |
| parent | aa3e5572c538d753dce11bf93532a75f95d22b40 (diff) | |
| parent | 4462dc02842698f173f518c1f5ce79c0fb89395a (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/inode.c
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 19b5109d9808..01bdd7500df4 100644 --- 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[] = { | |||
| 363 | .type = EV_PWR, | 363 | .type = EV_PWR, |
| 364 | .code = KEY_SUSPEND, | 364 | .code = KEY_SUSPEND, |
| 365 | .gpio = SPITZ_GPIO_ON_KEY, | 365 | .gpio = SPITZ_GPIO_ON_KEY, |
| 366 | .desc = "On/Off", | 366 | .desc = "On Off", |
| 367 | .wakeup = 1, | 367 | .wakeup = 1, |
| 368 | }, | 368 | }, |
| 369 | /* Two buttons detecting the lid state */ | 369 | /* Two buttons detecting the lid state */ |