diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
| commit | 34161db6b14d984fb9b06c735b7b42f8803f6851 (patch) | |
| tree | 99656278b6697f1cde5b05894b7c0ee22c63a00e /arch/arm/mach-omap1/leds-osk.c | |
| parent | 5847e1f4d058677c5e46dc6c3e3c70e8855ea3ba (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Conflicts:
include/linux/sunrpc/xprt.h
net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
Diffstat (limited to 'arch/arm/mach-omap1/leds-osk.c')
| -rw-r--r-- | arch/arm/mach-omap1/leds-osk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c index 3b29e59b0e6f..0cbf1b0071f8 100644 --- a/arch/arm/mach-omap1/leds-osk.c +++ b/arch/arm/mach-omap1/leds-osk.c | |||
| @@ -35,7 +35,7 @@ static u8 hw_led_state; | |||
| 35 | 35 | ||
| 36 | static u8 tps_leds_change; | 36 | static u8 tps_leds_change; |
| 37 | 37 | ||
| 38 | static void tps_work(void *unused) | 38 | static void tps_work(struct work_struct *unused) |
| 39 | { | 39 | { |
| 40 | for (;;) { | 40 | for (;;) { |
| 41 | u8 leds; | 41 | u8 leds; |
| @@ -61,7 +61,7 @@ static void tps_work(void *unused) | |||
| 61 | } | 61 | } |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | static DECLARE_WORK(work, tps_work, NULL); | 64 | static DECLARE_WORK(work, tps_work); |
| 65 | 65 | ||
| 66 | #ifdef CONFIG_OMAP_OSK_MISTRAL | 66 | #ifdef CONFIG_OMAP_OSK_MISTRAL |
| 67 | 67 | ||