diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /net/rfkill/rfkill-input.c | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'net/rfkill/rfkill-input.c')
| -rw-r--r-- | net/rfkill/rfkill-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c index e5c840c30284..230e35c59786 100644 --- a/net/rfkill/rfkill-input.c +++ b/net/rfkill/rfkill-input.c | |||
| @@ -55,7 +55,7 @@ static void rfkill_task_handler(struct work_struct *work) | |||
| 55 | 55 | ||
| 56 | static void rfkill_schedule_toggle(struct rfkill_task *task) | 56 | static void rfkill_schedule_toggle(struct rfkill_task *task) |
| 57 | { | 57 | { |
| 58 | unsigned int flags; | 58 | unsigned long flags; |
| 59 | 59 | ||
| 60 | spin_lock_irqsave(&task->lock, flags); | 60 | spin_lock_irqsave(&task->lock, flags); |
| 61 | 61 | ||