[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20061020191711.GD8894@flint.arm.linux.org.uk>
Date: Fri, 20 Oct 2006 20:17:11 +0100
From: Russell King <rmk+lkml@....linux.org.uk>
To: Alan Cox <alan@...rguk.ukuu.org.uk>
Cc: akpm@...l.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] arm: switch to new pci_get_bus_and_slot API
On Mon, Oct 16, 2006 at 04:49:50PM +0100, Alan Cox wrote:
> Signed-off-by: Alan Cox <alan@...hat.com>
Applied a while back, but just discovered these in the ARM kautobuild
logs...
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c
> --- linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c 2006-10-13 15:06:14.000000000 +0100
> +++ linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c 2006-10-13 17:14:23.000000000 +0100
> @@ -133,11 +133,13 @@
> struct pci_dev *dev;
>
> if (ixdp2x00_master_npu()) {
> - dev = pci_find_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
> + dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
> pci_remove_bus_device(dev);
> + pci_dev_put(dev)
Missing ;
> } else {
> - dev = pci_find_slot(1, IXDP2400_MASTER_ENET_DEVFN);
> + dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN);
> pci_remove_bus_device(dev);
> + pci_dev_put(dev)
Missing ;
Now fixed in my tree.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists