diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-26 02:43:24 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-26 02:43:24 -0400 |
| commit | 46b2835771ad8ef19b8e081e8c90439408c7645f (patch) | |
| tree | 4059e1949df40d6c9078bcbe6783b03384ba61f3 /arch/powerpc/kernel/irq.c | |
| parent | 9d78592ed72dbff1d8825207f8def07858a49768 (diff) | |
| parent | 141707892e92dca69b7b8af65b9367da2d1f8120 (diff) | |
Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 2fc87862146c..24bea97c736c 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -418,10 +418,10 @@ irq_hw_number_t virq_to_hw(unsigned int virq) | |||
| 418 | } | 418 | } |
| 419 | EXPORT_SYMBOL_GPL(virq_to_hw); | 419 | EXPORT_SYMBOL_GPL(virq_to_hw); |
| 420 | 420 | ||
| 421 | struct irq_host *irq_alloc_host(unsigned int revmap_type, | 421 | __init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type, |
| 422 | unsigned int revmap_arg, | 422 | unsigned int revmap_arg, |
| 423 | struct irq_host_ops *ops, | 423 | struct irq_host_ops *ops, |
| 424 | irq_hw_number_t inval_irq) | 424 | irq_hw_number_t inval_irq) |
| 425 | { | 425 | { |
| 426 | struct irq_host *host; | 426 | struct irq_host *host; |
| 427 | unsigned int size = sizeof(struct irq_host); | 427 | unsigned int size = sizeof(struct irq_host); |