From: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/aic7xxx/aic79xx.h | 3 --- drivers/scsi/aic7xxx/aic79xx_core.c | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/scsi/aic7xxx/aic79xx_core.c~drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static drivers/scsi/aic7xxx/aic79xx_core.c --- devel/drivers/scsi/aic7xxx/aic79xx_core.c~drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static 2006-03-21 23:05:43.000000000 -0800 +++ devel-akpm/drivers/scsi/aic7xxx/aic79xx_core.c 2006-03-21 23:05:43.000000000 -0800 @@ -263,6 +263,9 @@ static void ahd_update_coalescing_value u_int mincmds); static int ahd_verify_vpd_cksum(struct vpd_config *vpd); static int ahd_wait_seeprom(struct ahd_softc *ahd); +static int ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, + int target, char channel, int lun, + u_int tag, role_t role); /******************************** Private Inlines *****************************/ @@ -7236,7 +7239,7 @@ ahd_busy_tcl(struct ahd_softc *ahd, u_in } /************************** SCB and SCB queue management **********************/ -int +static int ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, int target, char channel, int lun, u_int tag, role_t role) { diff -puN drivers/scsi/aic7xxx/aic79xx.h~drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static drivers/scsi/aic7xxx/aic79xx.h --- devel/drivers/scsi/aic7xxx/aic79xx.h~drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static 2006-03-21 23:05:43.000000000 -0800 +++ devel-akpm/drivers/scsi/aic7xxx/aic79xx.h 2006-03-21 23:05:43.000000000 -0800 @@ -1347,9 +1347,6 @@ int ahd_pci_test_register_access(struct /************************** SCB and SCB queue management **********************/ void ahd_qinfifo_requeue_tail(struct ahd_softc *ahd, struct scb *scb); -int ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, - int target, char channel, int lun, - u_int tag, role_t role); /****************************** Initialization ********************************/ struct ahd_softc *ahd_alloc(void *platform_arg, char *name); _ - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html