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
/
alpha
/
kernel
/
pci.c
diff --git
a/arch/alpha/kernel/pci.c
b/arch/alpha/kernel/pci.c
index
2a8b364
..
3c10b9a
100644
(file)
--- a/
arch/alpha/kernel/pci.c
+++ b/
arch/alpha/kernel/pci.c
@@
-12,7
+12,6
@@
* Nov 2000, Ivan Kokshaysky <ink@jurassic.park.msu.ru>
* PCI-PCI bridges cleanup
*/
* Nov 2000, Ivan Kokshaysky <ink@jurassic.park.msu.ru>
* PCI-PCI bridges cleanup
*/
-#include <linux/config.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <linux/init.h>
@@
-124,12
+123,12
@@
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final);
void
pcibios_align_resource(void *data, struct resource *res,
void
pcibios_align_resource(void *data, struct resource *res,
-
unsigned long size, unsigned long
align)
+
resource_size_t size, resource_size_t
align)
{
struct pci_dev *dev = data;
struct pci_controller *hose = dev->sysdata;
unsigned long alignto;
{
struct pci_dev *dev = data;
struct pci_controller *hose = dev->sysdata;
unsigned long alignto;
-
unsigned long
start = res->start;
+
resource_size_t
start = res->start;
if (res->flags & IORESOURCE_IO) {
/* Make sure we start at our min on all hoses */
if (res->flags & IORESOURCE_IO) {
/* Make sure we start at our min on all hoses */
@@
-517,10
+516,11
@@
sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)
if (bus == 0 && dfn == 0) {
hose = pci_isa_hose;
} else {
if (bus == 0 && dfn == 0) {
hose = pci_isa_hose;
} else {
- dev = pci_
fi
nd_slot(bus, dfn);
+ dev = pci_
get_bus_a
nd_slot(bus, dfn);
if (!dev)
return -ENODEV;
hose = dev->sysdata;
if (!dev)
return -ENODEV;
hose = dev->sysdata;
+ pci_dev_put(dev);
}
}
}
}