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

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

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);
 }

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)
-	struct 	ahc_softc *ahc;
+read_brdctl(struct ahc_softc *ahc)
 {
 	uint8_t brdctl;
 	uint8_t value;