i2o struct change updates to make i2o compile once again
--===================================================================== Mohammad A. Haque http://www.haque.net/ mhaque@haque.net
"Alcohol and calculus don't mix. Project Lead Don't drink and derive." --Unknown http://wm.themes.org/ batmanppc@themes.org =====================================================================
--- linux/drivers/i2o/i2o_pci.c.orig Sun Aug 12 14:16:18 2001 +++ linux/drivers/i2o/i2o_pci.c Sat Oct 13 04:02:57 2001 @@ -162,7 +162,7 @@ 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); --- linux/drivers/i2o/i2o_core.c.orig Thu Aug 16 12:50:24 2001 +++ linux/drivers/i2o/i2o_core.c Sat Oct 13 04:06:08 2001 @@ -1924,12 +1924,12 @@ 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 @@ 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, --- linux/include/linux/i2o.h.orig Sat Oct 13 03:40:03 2001 +++ linux/include/linux/i2o.h Sat Oct 13 04:13:23 2001 @@ -30,6 +30,7 @@ #include <asm/semaphore.h> /* Needed for MUTEX init macros */ #include <linux/config.h> +#include <linux/ioport.h> #include <linux/notifier.h> #include <asm/atomic.h> --- linux/drivers/i2o/i2o_block.c.orig Mon Sep 10 15:42:31 2001 +++ linux/drivers/i2o/i2o_block.c Sat Oct 13 04:15:18 2001 @@ -1989,7 +1989,6 @@ void cleanup_module(void) { - struct gendisk *gdp; int i; if(evt_running) {
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Oct 15 2001 - 21:00:48 EST