diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-21 11:49:57 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-21 11:49:57 -0400 |
| commit | ff5f149b6aec8edbfa3698721667acd043009a33 (patch) | |
| tree | d052553eb296dfee3f01b1cb2b717cb7ccf3127a /arch/arm/mach-pxa/spitz.c | |
| parent | f0218b3e9974f06014b61be8987159f4a20e011e (diff) | |
| parent | 580d607cd666dfabfc1c7b0fb08c8ac690c7c87f (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7
Conflicts:
include/linux/ftrace_event.h
include/trace/ftrace.h
kernel/trace/trace_event_perf.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_syscalls.c
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
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 */ |