diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-05 18:55:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-05 18:55:00 -0400 |
commit | 0dac723e5c15ddb9bd26c1db21ee64ab71ae4925 (patch) | |
tree | ce19d6114a07cf32c821090c5f7b53685cff28a0 /include | |
parent | 87a927c715789853cc8331d76039a2fd657a832a (diff) | |
parent | 795bb15e0735bd2b0015ca333fa157399b72c168 (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Update defconfigs
[POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
[POWERPC] Fix PMI breakage in cbe_cbufreq driver
[POWERPC] Disable old EMAC driver in arch/powerpc
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/irq.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h index 4734cc178db5..05dd5a3eb3aa 100644 --- a/include/asm-powerpc/irq.h +++ b/include/asm-powerpc/irq.h | |||
@@ -138,10 +138,7 @@ struct irq_map_entry { | |||
138 | 138 | ||
139 | extern struct irq_map_entry irq_map[NR_IRQS]; | 139 | extern struct irq_map_entry irq_map[NR_IRQS]; |
140 | 140 | ||
141 | static inline irq_hw_number_t virq_to_hw(unsigned int virq) | 141 | extern irq_hw_number_t virq_to_hw(unsigned int virq); |
142 | { | ||
143 | return irq_map[virq].hwirq; | ||
144 | } | ||
145 | 142 | ||
146 | /** | 143 | /** |
147 | * irq_alloc_host - Allocate a new irq_host data structure | 144 | * irq_alloc_host - Allocate a new irq_host data structure |