diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
| commit | c5974932c1e8514d3478573bb52beebeb2c786dd (patch) | |
| tree | a204156fbb0036fb76e89ceffa15a30e90bc3f75 /include/linux/irq.h | |
| parent | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (diff) | |
| parent | e760e716d47b48caf98da348368fd41b4a9b9e7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/irq.h')
| -rw-r--r-- | include/linux/irq.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index bfd9efb5cb49..176e5e790a44 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
| @@ -285,7 +285,6 @@ extern void handle_bad_irq(unsigned int irq, struct irq_desc *desc); | |||
| 285 | 285 | ||
| 286 | /* | 286 | /* |
| 287 | * Monolithic do_IRQ implementation. | 287 | * Monolithic do_IRQ implementation. |
| 288 | * (is an explicit fastcall, because i386 4KSTACKS calls it from assembly) | ||
| 289 | */ | 288 | */ |
| 290 | #ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ | 289 | #ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ |
| 291 | extern unsigned int __do_IRQ(unsigned int irq); | 290 | extern unsigned int __do_IRQ(unsigned int irq); |