diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/arm/mach-pxa/spitz.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 4b50f144fa48..28352c0b8c34 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
| @@ -389,13 +389,13 @@ static struct gpio_keys_button spitz_gpio_keys[] = { | |||
| 389 | .type = EV_SW, | 389 | .type = EV_SW, |
| 390 | .code = 0, | 390 | .code = 0, |
| 391 | .gpio = SPITZ_GPIO_SWA, | 391 | .gpio = SPITZ_GPIO_SWA, |
| 392 | .desc = "Display Down", | 392 | .desc = "Display Down", |
| 393 | }, | 393 | }, |
| 394 | { | 394 | { |
| 395 | .type = EV_SW, | 395 | .type = EV_SW, |
| 396 | .code = 1, | 396 | .code = 1, |
| 397 | .gpio = SPITZ_GPIO_SWB, | 397 | .gpio = SPITZ_GPIO_SWB, |
| 398 | .desc = "Lid Closed", | 398 | .desc = "Lid Closed", |
| 399 | }, | 399 | }, |
| 400 | }; | 400 | }; |
| 401 | 401 | ||