git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp2000
/
ixdp2400.c
diff --git
a/arch/arm/mach-ixp2000/ixdp2400.c
b/arch/arm/mach-ixp2000/ixdp2400.c
index
0910127
..
0fdd03a
100644
(file)
--- a/
arch/arm/mach-ixp2000/ixdp2400.c
+++ b/
arch/arm/mach-ixp2000/ixdp2400.c
@@
-14,7
+14,6
@@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mm.h>
@@
-134,11
+133,13
@@
static void ixdp2400_pci_postinit(void)
struct pci_dev *dev;
if (ixdp2x00_master_npu()) {
struct pci_dev *dev;
if (ixdp2x00_master_npu()) {
- dev = pci_
fi
nd_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
+ dev = pci_
get_bus_a
nd_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
pci_remove_bus_device(dev);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
} else {
} else {
- dev = pci_
fi
nd_slot(1, IXDP2400_MASTER_ENET_DEVFN);
+ dev = pci_
get_bus_a
nd_slot(1, IXDP2400_MASTER_ENET_DEVFN);
pci_remove_bus_device(dev);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
ixdp2x00_slave_pci_postinit();
}
ixdp2x00_slave_pci_postinit();
}