Merge bk://kernel.bkbits.net/davem/net-2.5

into penguin.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://kernel.bkbits.net/davem/net-2.5
into penguin.transmeta.com:/home/torvalds/v2.5/linux
fdfa4630 · Linus Torvalds · 037d5e9d · 72823cc6 · fdfa4630 · fdfa4630
Commit fdfa4630 authored May 08, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

drivers/scsi/aic7xxx/aic7xxx_osm.h drivers/scsi/aic7xxx/aic7xxx_osm.h +1 -1

drivers/scsi/aic7xxx/aic7xxx_pci.c drivers/scsi/aic7xxx/aic7xxx_pci.c +1 -2

No files found.
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -768,7 +768,7 @@ ahc_done_unlock(struct ahc_softc *ahc, unsigned long *flags)
 }
 static __inline void
-ahc_list_lockinit()
+ahc_list_lockinit(void)
 {
 	spin_lock_init(&ahc_list_spinlock);
 }

--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -1958,8 +1958,7 @@ write_brdctl(struct ahc_softc *ahc, uint8_t value)
 }
 static uint8_t
-read_brdctl(ahc)
+read_brdctl(struct ahc_softc *ahc)
-	struct 	ahc_softc *ahc;
 {
 	uint8_t brdctl;
 	uint8_t value;