diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 18:50:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 18:50:20 -0400 |
| commit | e4903fb59590f86190280a549420f6cb85bd7f7e (patch) | |
| tree | 48a299a5e61d7645811f804d1a5bfeb408bfb202 /include/asm-ia64/machvec.h | |
| parent | 6a28a05f9b1b4db920e390ac89968ed6d2e4b8ec (diff) | |
| parent | cb2e0912f714b116812ef5834b5ba80d894ac967 (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] Nail two more simple section mismatch errors
[IA64] fix section mismatch warnings
[IA64] rename partial_page
[IA64] Ensure that machvec is set up takes place before serial console
[IA64] vector-domain - fix vector_table
[IA64] vector-domain - handle assign_irq_vector(AUTO_ASSIGN)
Diffstat (limited to 'include/asm-ia64/machvec.h')
| -rw-r--r-- | include/asm-ia64/machvec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h index ca33eb181ff2..5cf8bf1e805e 100644 --- a/include/asm-ia64/machvec.h +++ b/include/asm-ia64/machvec.h | |||
| @@ -275,6 +275,7 @@ struct ia64_machine_vector { | |||
| 275 | 275 | ||
| 276 | extern struct ia64_machine_vector ia64_mv; | 276 | extern struct ia64_machine_vector ia64_mv; |
| 277 | extern void machvec_init (const char *name); | 277 | extern void machvec_init (const char *name); |
| 278 | extern void machvec_init_from_cmdline(const char *cmdline); | ||
| 278 | 279 | ||
| 279 | # else | 280 | # else |
| 280 | # error Unknown configuration. Update asm-ia64/machvec.h. | 281 | # error Unknown configuration. Update asm-ia64/machvec.h. |