diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 16:18:05 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 16:18:05 -0800 |
commit | 0f151e8b214c1df3f571020b849382933f2cdce7 (patch) | |
tree | 9ae4bb3361e9d7e286674b1d59b9dc931c74caf1 /arch/powerpc/sysdev/mpic_pasemi_msi.c | |
parent | e80af3a8dbbbf431b2070cc760699f01c5a6ac69 (diff) | |
parent | a8b87f609d1332216e683b473d33342c86f21ac3 (diff) | |
download | kernel-crypto-0f151e8b214c1df3f571020b849382933f2cdce7.tar.gz kernel-crypto-0f151e8b214c1df3f571020b849382933f2cdce7.tar.xz kernel-crypto-0f151e8b214c1df3f571020b849382933f2cdce7.zip |
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] pasemi: Remove warning in mpic_pasemi_msi.c
[POWERPC] pasemi: Register i2c devices at boot
[POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg}
[POWERPC] Fix warning in pseries/power.c
[POWERPC] Fix bootwrapper builds with older gcc versions
[POWERPC] Fix dt_mem_next_cell() to read the full address
[POWERPC] Kill sparse warnings in kprobes
[POWERPC] spufs: fix scheduler starvation by idle contexts
[POWERPC] 44x: Add multiplatform defconfig
[POWERPC] 44x: Fix Kconfig formatting
[POWERPC] 4xx: Update defconfigs for 2.6.25
[POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
[POWERPC] PPC440EP Interrupt Triggering and Level Settings
[POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table
Diffstat (limited to 'arch/powerpc/sysdev/mpic_pasemi_msi.c')
-rw-r--r-- | arch/powerpc/sysdev/mpic_pasemi_msi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c index d6bfda30ac8..33cbfb22ce3 100644 --- a/arch/powerpc/sysdev/mpic_pasemi_msi.c +++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c @@ -95,7 +95,6 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) unsigned int virq; struct msi_desc *entry; struct msi_msg msg; - u64 addr; pr_debug("pasemi_msi_setup_msi_irqs, pdev %p nvec %d type %d\n", pdev, nvec, type); @@ -132,8 +131,8 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) set_irq_chip(virq, &mpic_pasemi_msi_chip); set_irq_type(virq, IRQ_TYPE_EDGE_RISING); - pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%lx) addr 0x%lx\n", - virq, hwirq, addr); + pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%lx) addr 0x%x\n", + virq, hwirq, msg.address_lo); /* Likewise, the device writes [0...511] into the target * register to generate MSI [512...1023] |