diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:05:50 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:05:50 +0100 |
commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /Documentation/DocBook/genericirq.tmpl | |
parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 (diff) | |
parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
download | op-kernel-dev-b0d44c0dbbd52effb731b1c0af9afd56215c48de.zip op-kernel-dev-b0d44c0dbbd52effb731b1c0af9afd56215c48de.tar.gz |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'Documentation/DocBook/genericirq.tmpl')
-rw-r--r-- | Documentation/DocBook/genericirq.tmpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl index 3a882d9..c671a01 100644 --- a/Documentation/DocBook/genericirq.tmpl +++ b/Documentation/DocBook/genericirq.tmpl @@ -440,6 +440,7 @@ desc->chip->end(); used in the generic IRQ layer. </para> !Iinclude/linux/irq.h +!Iinclude/linux/interrupt.h </chapter> <chapter id="pubfunctions"> |