diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
| commit | 4ecd33d930591d41fe356160593a9076467b961c (patch) | |
| tree | b9051a334540bbce38db1b2b03cebb4cf1d51f73 /net/rfkill/rfkill-input.c | |
| parent | 7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'net/rfkill/rfkill-input.c')
| -rw-r--r-- | net/rfkill/rfkill-input.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c index 21124ec0a73d..bfdade72e066 100644 --- a/net/rfkill/rfkill-input.c +++ b/net/rfkill/rfkill-input.c | |||
| @@ -256,6 +256,11 @@ static struct input_handler rfkill_handler = { | |||
| 256 | 256 | ||
| 257 | static int __init rfkill_handler_init(void) | 257 | static int __init rfkill_handler_init(void) |
| 258 | { | 258 | { |
| 259 | unsigned long last_run = jiffies - msecs_to_jiffies(500); | ||
| 260 | rfkill_wlan.last = last_run; | ||
| 261 | rfkill_bt.last = last_run; | ||
| 262 | rfkill_uwb.last = last_run; | ||
| 263 | rfkill_wimax.last = last_run; | ||
| 259 | return input_register_handler(&rfkill_handler); | 264 | return input_register_handler(&rfkill_handler); |
| 260 | } | 265 | } |
| 261 | 266 | ||
