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 /arch/ia64/kernel/machvec.c | |
| 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 'arch/ia64/kernel/machvec.c')
| -rw-r--r-- | arch/ia64/kernel/machvec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/machvec.c b/arch/ia64/kernel/machvec.c index 9620822270a6..13df337508e7 100644 --- a/arch/ia64/kernel/machvec.c +++ b/arch/ia64/kernel/machvec.c | |||
| @@ -35,7 +35,7 @@ lookup_machvec (const char *name) | |||
| 35 | return 0; | 35 | return 0; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | void | 38 | void __init |
| 39 | machvec_init (const char *name) | 39 | machvec_init (const char *name) |
| 40 | { | 40 | { |
| 41 | struct ia64_machine_vector *mv; | 41 | struct ia64_machine_vector *mv; |