i2o struct change updates
PATCH 1/1 i2o struct change updates
i2o struct change updates to make i2o compile once again
Signature · 8 lines
=====================================================================
Mohammad A. Haque http://www.haque.net/
[email protected]
"Alcohol and calculus don't mix. Project Lead
Don't drink and derive." --Unknown http://wm.themes.org/
[email protected]
=====================================================================drivers/i2o/i2o_pci.c renamed from drivers/i2o/i2o_pci.c.orig +1 -1
@@ -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 );
drivers/i2o/i2o_core.c renamed from drivers/i2o/i2o_core.c.orig +4 -4
@@ -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,
include/linux/i2o.h renamed from include/linux/i2o.h.orig +1 -0
@@ -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>
drivers/i2o/i2o_block.c renamed from drivers/i2o/i2o_block.c.orig +0 -1
@@ -1989,7 +1989,6 @@void cleanup_module (void ) { -struct gendisk *gdp;int i;if (evt_running) {
Quoted 1 line
i2o struct change updates to make i2o compile once again
I've got the relevant i2o merge queued for Linus already