diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:24:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:24:46 -0800 |
| commit | aed492fcb972130f11cd62fd8ca0b2af95f54d03 (patch) | |
| tree | ecd755228f49b188323b4dd257b06fc43fb2f9ae /drivers/message | |
| parent | 2ef7e8cef81e6a091de2aebd9d30c273edf6c13c (diff) | |
v2.4.12.5 -> v2.4.12.6
- Stephen Rothwell: APM idle time handling fixes, docbook update, cleanup
- Jeff Garzik: network driver updates
- Greg KH: USB updates
- Al Viro: UFS update, binfmt_misc rewrite.
- Andreas Dilger: /dev/random fixes
- David Miller: network/sparc updates
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/i2o/i2o_core.c | 8 | ||||
| -rw-r--r-- | drivers/message/i2o/i2o_pci.c | 2 | ||||
| -rw-r--r-- | drivers/message/i2o/i2o_scsi.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/message/i2o/i2o_core.c b/drivers/message/i2o/i2o_core.c index d4d0d0e75351..25360fdd2c07 100644 --- a/drivers/message/i2o/i2o_core.c +++ b/drivers/message/i2o/i2o_core.c @@ -1924,12 +1924,12 @@ static int i2o_systab_send(struct i2o_controller *iop) if(iop->status_block->current_mem_size < iop->status_block->desired_mem_size) { struct resource *res = &iop->mem_resource; - res->name = iop->bus.pci.pdev->bus->name; + res->name = iop->pdev->bus->name; res->flags = IORESOURCE_MEM; res->start = 0; res->end = 0; printk("%s: requires private memory resources.\n", iop->name); - root = pci_find_parent_resource(iop->bus.pci.pdev, res); + root = pci_find_parent_resource(iop->pdev, res); if(root==NULL) printk("Can't find parent resource!\n"); if(root && allocate_resource(root, res, @@ -1950,12 +1950,12 @@ static int i2o_systab_send(struct i2o_controller *iop) if(iop->status_block->current_io_size < iop->status_block->desired_io_size) { struct resource *res = &iop->io_resource; - res->name = iop->bus.pci.pdev->bus->name; + res->name = iop->pdev->bus->name; res->flags = IORESOURCE_IO; res->start = 0; res->end = 0; printk("%s: requires private memory resources.\n", iop->name); - root = pci_find_parent_resource(iop->bus.pci.pdev, res); + root = pci_find_parent_resource(iop->pdev, res); if(root==NULL) printk("Can't find parent resource!\n"); if(root && allocate_resource(root, res, diff --git a/drivers/message/i2o/i2o_pci.c b/drivers/message/i2o/i2o_pci.c index 64c9ede1606e..056b90fafdd0 100644 --- a/drivers/message/i2o/i2o_pci.c +++ b/drivers/message/i2o/i2o_pci.c @@ -162,7 +162,7 @@ int __init i2o_pci_install(struct pci_dev *dev) c->bus.pci.queue_buggy = 0; c->bus.pci.dpt = 0; c->bus.pci.short_req = 0; - c->bus.pci.pdev = dev; + c->pdev = dev; c->irq_mask = (volatile u32 *)(mem+0x34); c->post_port = (volatile u32 *)(mem+0x40); diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c index 7275a7703d8e..93f27fb37aae 100644 --- a/drivers/message/i2o/i2o_scsi.c +++ b/drivers/message/i2o/i2o_scsi.c @@ -48,9 +48,9 @@ #include <linux/blk.h> #include <linux/version.h> #include <linux/i2o.h> -#include "../scsi/scsi.h" -#include "../scsi/hosts.h" -#include "../scsi/sd.h" +#include "../../scsi/scsi.h" +#include "../../scsi/hosts.h" +#include "../../scsi/sd.h" #include "i2o_scsi.h" #define VERSION_STRING "Version 0.0.1" @@ -909,4 +909,4 @@ MODULE_AUTHOR("Red Hat Software"); static Scsi_Host_Template driver_template = I2OSCSI; -#include "../scsi/scsi_module.c" +#include "../../scsi/scsi_module.c" |