diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 15:53:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 15:53:21 -0400 |
| commit | 2a383c63ff933a496f19d6559ab54ac14871b7f3 (patch) | |
| tree | b0f4a4fbc4d882c7fea7c6b8f69924284abff76d /drivers/char | |
| parent | 8bd994815987dda0947bd9afd887b1410713d4f7 (diff) | |
| parent | 2bd62a40f63bd628c43a2f3637b252d0967659b0 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Quicklist support for IA64
[IA64] fix Kprobes reentrancy
[IA64] SN: validate smp_affinity mask on intr redirect
[IA64] drivers/char/snsc_event.c:206: warning: unused variable `p'
[IA64] mca.c:121: warning: 'cpe_poll_timer' defined but not used
[IA64] Fix - Section mismatch: reference to .init.data:mvec_name
[IA64] more warning cleanups
[IA64] Wire up epoll_pwait and utimensat
[IA64] Fix warnings resulting from type-checking in dev_dbg()
[IA64] typo s/kenrel/kernel/
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/snsc_event.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c index 2f56e8c54897..1b75b0b7d542 100644 --- a/drivers/char/snsc_event.c +++ b/drivers/char/snsc_event.c | |||
| @@ -203,8 +203,6 @@ scdrv_dispatch_event(char *event, int len) | |||
| 203 | class = (code & EV_CLASS_MASK); | 203 | class = (code & EV_CLASS_MASK); |
| 204 | 204 | ||
| 205 | if (class == EV_CLASS_PWRD_NOTIFY || code == ENV_PWRDN_PEND) { | 205 | if (class == EV_CLASS_PWRD_NOTIFY || code == ENV_PWRDN_PEND) { |
| 206 | struct task_struct *p; | ||
| 207 | |||
| 208 | if (snsc_shutting_down) | 206 | if (snsc_shutting_down) |
| 209 | return; | 207 | return; |
| 210 | 208 | ||