diff options
| author | Alfred M. Szmidt <ams@gnu.org> | 2005-06-02 18:52:39 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:15:26 +0200 |
| commit | 8a6f23293ca4540950eb523d9ff9727ca92241cd (patch) | |
| tree | b421c6eeeb5710beec5b6568c40d7a036128a535 /linux/src/drivers/net/hp100.c | |
| parent | e84cb79bec1f5cfa976558bbc9c155b8b82a1b45 (diff) | |
2005-05-28 Alfred M. Szmidt <ams@gnu.org>
* linux/src/drivers/scsi/u14-34f.c (ihdlr): Silence gcc 4.x
errors.
* linux/src/drivers/scsi/qlogicisp.h: Likewise.
* linux/src/drivers/scsi/advansys.c: Likewise.
(advansys_reset, advansys_interrupt, asc_scsi_done_list,
(asc_enqueue, asc_dequeue, asc_dequeue_list, asc_rmqueue,
(asc_isqueued): Likewise.
* linux/src/drivers/scsi/53c78xx.c (NCR53c7xx_queue_command):
Likewise.
* linux/src/drivers/net/ne2k-pci.c (ne_block_input)
(ne_block_output): Likewise.
* linux/src/drivers/net/hp100.c (__initfunc): Likewise.
* linux/src/drivers/net/3c507.c (el16_interrupt): Likewise.
* linux/dev/drivers/scsi/seagate.c (seagate_st0x_queue_command):
Likewise.
Diffstat (limited to 'linux/src/drivers/net/hp100.c')
| -rw-r--r-- | linux/src/drivers/net/hp100.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/src/drivers/net/hp100.c b/linux/src/drivers/net/hp100.c index 2e4f804..0b86ef4 100644 --- a/linux/src/drivers/net/hp100.c +++ b/linux/src/drivers/net/hp100.c @@ -2,7 +2,7 @@ ** hp100.c ** HP CASCADE Architecture Driver for 100VG-AnyLan Network Adapters ** -** $Id: hp100.c,v 1.1 1999/04/26 05:52:18 tb Exp $ +** $Id: hp100.c,v 1.1.4.1 2005/06/02 18:52:39 ams Exp $ ** ** Based on the HP100 driver written by Jaroslav Kysela <perex@jcu.cz> ** Extended for new busmaster capable chipsets by @@ -648,8 +648,7 @@ __initfunc(static int hp100_probe1( struct device *dev, int ioaddr, u_char bus, { mem_ptr_phys = (u_int *)( hp100_inw( MEM_MAP_LSW ) | ( hp100_inw( MEM_MAP_MSW ) << 16 ) ); - (u_int)mem_ptr_phys &= ~0x1fff; /* 8k alignment */ - + mem_ptr_phys = (u_int *) ((u_int) mem_ptr_phys & ~0x1fff); /* 8k alignment */ if ( bus == HP100_BUS_ISA && ( (u_long)mem_ptr_phys & ~0xfffff ) != 0 ) { printk("hp100: %s: Can only use programmed i/o mode.\n", dev->name); |