diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.61/drivers/ide/legacy/ide-cs.c linux-2.5.61-ac2/drivers/ide/legacy/ide-cs.c
--- linux-2.5.61/drivers/ide/legacy/ide-cs.c 2003-02-10 18:38:45.000000000 +0000
+++ linux-2.5.61-ac2/drivers/ide/legacy/ide-cs.c 2003-02-18 18:06:19.000000000 +0000
@@ -225,10 +225,10 @@
#define CFG_CHECK(fn, args...) \
if (CardServices(fn, args) != 0) goto next_entry
-static int idecs_register(int io, int ctl, int irq)
+static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq)
{
hw_regs_t hw;
- ide_init_hwif_ports(&hw, (ide_ioreg_t)io, (ide_ioreg_t)ctl, NULL);
+ ide_init_hwif_ports(&hw, io, ctl, NULL);
hw.irq = irq;
hw.chipset = ide_pci;
return ide_register_hw(&hw, NULL);
@@ -244,7 +244,8 @@
config_info_t conf;
cistpl_cftable_entry_t *cfg = &parse.cftable_entry;
cistpl_cftable_entry_t dflt = { 0 };
- int i, pass, last_ret, last_fn, hd, io_base, ctl_base, is_kme = 0;
+ int i, pass, last_ret, last_fn, hd, is_kme = 0;
+ unsigned long io_base, ctl_base;
DEBUG(0, "ide_config(0x%p)\n", link);
@@ -367,7 +368,7 @@
}
if (hd < 0) {
- printk(KERN_NOTICE "ide-cs: ide_register() at 0x%3x & 0x%3x"
+ printk(KERN_NOTICE "ide-cs: ide_register() at 0x%3lx & 0x%3lx"
", irq %u failed\n", io_base, ctl_base,
link->irq.AssignedIRQ);
goto failed;
-
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 : Sun Feb 23 2003 - 22:00:22 EST