summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-05 15:55:00 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-05 15:55:00 -0700
commit0dac723e5c15ddb9bd26c1db21ee64ab71ae4925 (patch)
treece19d6114a07cf32c821090c5f7b53685cff28a0 /include
parent87a927c715789853cc8331d76039a2fd657a832a (diff)
parent795bb15e0735bd2b0015ca333fa157399b72c168 (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.h5
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 {
extern struct irq_map_entry irq_map[NR_IRQS];
-static inline irq_hw_number_t virq_to_hw(unsigned int virq)
-{
- return irq_map[virq].hwirq;
-}
+extern irq_hw_number_t virq_to_hw(unsigned int virq);
/**
* irq_alloc_host - Allocate a new irq_host data structure