diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/powerpc/kernel/ibmebus.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/kernel/ibmebus.c')
| -rw-r--r-- | arch/powerpc/kernel/ibmebus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c index 97ddc02a3d42..68e5ab0443d2 100644 --- a/arch/powerpc/kernel/ibmebus.c +++ b/arch/powerpc/kernel/ibmebus.c | |||
| @@ -323,7 +323,7 @@ int ibmebus_request_irq(struct ibmebus_dev *dev, | |||
| 323 | unsigned long irq_flags, const char * devname, | 323 | unsigned long irq_flags, const char * devname, |
| 324 | void *dev_id) | 324 | void *dev_id) |
| 325 | { | 325 | { |
| 326 | unsigned int irq = irq_create_mapping(NULL, ist, 0); | 326 | unsigned int irq = irq_create_mapping(NULL, ist); |
| 327 | 327 | ||
| 328 | if (irq == NO_IRQ) | 328 | if (irq == NO_IRQ) |
| 329 | return -EINVAL; | 329 | return -EINVAL; |