diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 21:15:12 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 21:15:12 +0300 |
commit | e691d24e9c5007486bef59c589c2a2d784e0c30b (patch) | |
tree | 29e146443430d934f076d89a4bbf035c33586aa9 /arch/x86/include/asm/irq.h | |
parent | 55065bc52795faae549abfb912aacc622dd63876 (diff) | |
parent | b5318d302f8a20eacbbfc01b0ee35b108085a363 (diff) | |
download | linux-e691d24e9c5007486bef59c589c2a2d784e0c30b.tar.xz |
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, olpc: Speed up device tree creation during boot
x86, olpc: Add OLPC device-tree support
x86, of: Define irq functions to allow drivers/of/* to build on x86
Diffstat (limited to 'arch/x86/include/asm/irq.h')
-rw-r--r-- | arch/x86/include/asm/irq.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index ba870bb6dd8e..c704b38c57a2 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -10,6 +10,9 @@ #include <asm/apicdef.h> #include <asm/irq_vectors.h> +/* Even though we don't support this, supply it to appease OF */ +static inline void irq_dispose_mapping(unsigned int virq) { } + static inline int irq_canonicalize(int irq) { return ((irq == 2) ? 9 : irq); |