diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /drivers/atm | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/ambassador.c | 6 | ||||
| -rw-r--r-- | drivers/atm/iphase.c | 4 | ||||
| -rw-r--r-- | drivers/atm/nicstar.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index 4fc415ea8..acf2c194c 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c @@ -376,13 +376,13 @@ static inline void dump_registers (const amb_dev * dev) { u32 * i; PRINTD (DBG_REGS, "reading PLX control: "); for (i = (u32 *) 0x00; i < (u32 *) 0x30; ++i) - rd_mem (dev, i); + rd_mem (dev, (size_t)i); PRINTD (DBG_REGS, "reading mailboxes: "); for (i = (u32 *) 0x40; i < (u32 *) 0x60; ++i) - rd_mem (dev, i); + rd_mem (dev, (size_t)i); PRINTD (DBG_REGS, "reading doorb irqev irqen reset:"); for (i = (u32 *) 0x60; i < (u32 *) 0x70; ++i) - rd_mem (dev, i); + rd_mem (dev, (size_t)i); } #else (void) dev; diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index c92345f00..053efbd30 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -2303,7 +2303,7 @@ __initfunc(static int ia_init(struct atm_dev *dev)) dev->number,error); return -EINVAL; } - IF_INIT(printk(DEV_LABEL "(itf %d): rev.%d,realbase=0x%x,irq=%d\n", + IF_INIT(printk(DEV_LABEL "(itf %d): rev.%d,realbase=0x%lx,irq=%d\n", dev->number, revision, real_base, iadev->irq);) /* find mapping size of board */ @@ -2342,7 +2342,7 @@ __initfunc(static int ia_init(struct atm_dev *dev)) dev->number); return error; } - IF_INIT(printk(DEV_LABEL " (itf %d): rev.%d,base=0x%x,irq=%d\n", + IF_INIT(printk(DEV_LABEL " (itf %d): rev.%d,base=0x%lx,irq=%d\n", dev->number, revision, base, iadev->irq);) /* filling the iphase dev structure */ diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index dd39f4ccf..733487374 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -441,7 +441,7 @@ static void ns_write_sram(ns_dev *card, u32 sram_address, u32 *value, int count) static int ns_init_card(int i, struct pci_dev *pcidev) { int j; - struct ns_dev *card; + struct ns_dev *card=NULL; unsigned short pci_command; unsigned char pci_latency; unsigned error; |