diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
| commit | ac98695d6c1508b724f246f38ce57fb4e3cec356 (patch) | |
| tree | 189969a3689b9b83eaf39314a7942cc781ff836b /drivers/char/keyboard.c | |
| parent | d9bc125caf592b7d081021f32ce5b717efdf70c8 (diff) | |
| parent | 93bbad8fe13a25dcf7f3bc628a71d1a7642ae61b (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/char/keyboard.c')
| -rw-r--r-- | drivers/char/keyboard.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index c654a3e0c697..cb8d691576da 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
| @@ -596,7 +596,6 @@ static void fn_spawn_con(struct vc_data *vc) | |||
| 596 | static void fn_SAK(struct vc_data *vc) | 596 | static void fn_SAK(struct vc_data *vc) |
| 597 | { | 597 | { |
| 598 | struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work; | 598 | struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work; |
| 599 | PREPARE_WORK(SAK_work, vc_SAK); | ||
| 600 | schedule_work(SAK_work); | 599 | schedule_work(SAK_work); |
| 601 | } | 600 | } |
| 602 | 601 | ||