diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-30 03:57:46 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-30 03:57:46 +0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /arch/ppc/syslib/m82xx_pci.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
| download | linux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.xz | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'arch/ppc/syslib/m82xx_pci.c')
| -rw-r--r-- | arch/ppc/syslib/m82xx_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c index 1941a8c7ca9a..63fa5b313396 100644 --- a/arch/ppc/syslib/m82xx_pci.c +++ b/arch/ppc/syslib/m82xx_pci.c @@ -159,7 +159,7 @@ pq2pci_init_irq(void) immap->im_memctl.memc_or8 = 0xffff8010; #endif for (irq = NR_CPM_INTS; irq < NR_CPM_INTS + 4; irq++) - irq_desc[irq].handler = &pq2pci_ic; + irq_desc[irq].chip = &pq2pci_ic; /* make PCI IRQ level sensitive */ immap->im_intctl.ic_siexr &= |