VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / scsi / aic7xxx / aic79xx_core.c

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 611d84b..4440afc 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -173,7 +173,7 @@ static void         ahd_handle_devreset(struct ahd_softc *ahd,
                                            struct ahd_devinfo *devinfo,
                                            u_int lun, cam_status status,
                                            char *message, int verbose_level);
-#if AHD_TARGET_MODE
+#ifdef AHD_TARGET_MODE
 static void            ahd_setup_target_msgin(struct ahd_softc *ahd,
                                               struct ahd_devinfo *devinfo,
                                               struct scb *scb);
@@ -1190,7 +1190,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                                        ahd->msgin_index = 0;
                                }
                        }
-#if AHD_TARGET_MODE
+#ifdef AHD_TARGET_MODE
                        else {
                                if (bus_phase == P_MESGOUT) {
                                        ahd->msg_type =
@@ -5303,7 +5303,7 @@ ahd_free(struct ahd_softc *ahd)
 
                tstate = ahd->enabled_targets[i];
                if (tstate != NULL) {
-#if AHD_TARGET_MODE
+#ifdef AHD_TARGET_MODE
                        int j;
 
                        for (j = 0; j < AHD_NUM_LUNS; j++) {
@@ -5319,7 +5319,7 @@ ahd_free(struct ahd_softc *ahd)
                        free(tstate, M_DEVBUF);
                }
        }
-#if AHD_TARGET_MODE
+#ifdef AHD_TARGET_MODE
        if (ahd->black_hole != NULL) {
                xpt_free_path(ahd->black_hole->path);
                free(ahd->black_hole, M_DEVBUF);
@@ -6575,7 +6575,7 @@ ahd_chip_init(struct ahd_softc *ahd)
        ahd_outb(ahd, CLRSINT3, NTRAMPERR|OSRAMPERR);
        ahd_outb(ahd, CLRINT, CLRSCSIINT);
 
-#if NEEDS_MORE_TESTING
+#ifdef NEEDS_MORE_TESTING
        /*
         * Always enable abort on incoming L_Qs if this feature is
         * supported.  We use this to catch invalid SCB references.
@@ -7157,7 +7157,7 @@ ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, int target,
        if (match != 0)
                match = ((lun == slun) || (lun == CAM_LUN_WILDCARD));
        if (match != 0) {
-#if AHD_TARGET_MODE
+#ifdef AHD_TARGET_MODE
                int group;
 
                group = XPT_FC_GROUP(scb->io_ctx->ccb_h.func_code);
@@ -7768,7 +7768,7 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset)
        /* Make sure the sequencer is in a safe location. */
        ahd_clear_critical_section(ahd);
 
-#if AHD_TARGET_MODE
+#ifdef AHD_TARGET_MODE
        if ((ahd->flags & AHD_TARGETROLE) != 0) {
                ahd_run_tqinfifo(ahd, /*paused*/TRUE);
        }