diff options
| author | mjacob <mjacob@FreeBSD.org> | 2001-06-22 01:02:41 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2001-06-22 01:02:41 +0000 |
| commit | de0e0b468f7970f94496ec8ea1d8d12837232891 (patch) | |
| tree | 1fe4a3d4ae1de5b877d6e66fdbb5b2b4e0aa97c6 /sys | |
| parent | 41aadec27ec02d6baf371a6af5d608f60b996538 (diff) | |
| download | FreeBSD-src-de0e0b468f7970f94496ec8ea1d8d12837232891.zip FreeBSD-src-de0e0b468f7970f94496ec8ea1d8d12837232891.tar.gz | |
Move check against CAM_NEW_TRAN_CODE ahead of the file that might include
the option file that would define it.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_freebsd.h | 7 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_osm.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/aic7xxx/aic7xxx_freebsd.h b/sys/dev/aic7xxx/aic7xxx_freebsd.h index b2bf917..f90caba 100644 --- a/sys/dev/aic7xxx/aic7xxx_freebsd.h +++ b/sys/dev/aic7xxx/aic7xxx_freebsd.h @@ -37,9 +37,6 @@ #ifndef _AIC7XXX_FREEBSD_H_ #define _AIC7XXX_FREEBSD_H_ -#ifdef CAM_NEW_TRAN_CODE -#define AHC_NEW_TRAN_SETTINGS -#endif /* CAM_NEW_TRAN_CODE */ #include <opt_aic7xxx.h> /* for config options */ #ifndef NPCI #include <pci.h> @@ -80,6 +77,10 @@ #include <cam/scsi/scsi_all.h> #include <cam/scsi/scsi_message.h> +#ifdef CAM_NEW_TRAN_CODE +#define AHC_NEW_TRAN_SETTINGS +#endif /* CAM_NEW_TRAN_CODE */ + /****************************** Platform Macros *******************************/ #define SIM_IS_SCSIBUS_B(ahc, sim) \ ((sim) == ahc->platform_data->sim_b) diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h index b2bf917..f90caba 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.h +++ b/sys/dev/aic7xxx/aic7xxx_osm.h @@ -37,9 +37,6 @@ #ifndef _AIC7XXX_FREEBSD_H_ #define _AIC7XXX_FREEBSD_H_ -#ifdef CAM_NEW_TRAN_CODE -#define AHC_NEW_TRAN_SETTINGS -#endif /* CAM_NEW_TRAN_CODE */ #include <opt_aic7xxx.h> /* for config options */ #ifndef NPCI #include <pci.h> @@ -80,6 +77,10 @@ #include <cam/scsi/scsi_all.h> #include <cam/scsi/scsi_message.h> +#ifdef CAM_NEW_TRAN_CODE +#define AHC_NEW_TRAN_SETTINGS +#endif /* CAM_NEW_TRAN_CODE */ + /****************************** Platform Macros *******************************/ #define SIM_IS_SCSIBUS_B(ahc, sim) \ ((sim) == ahc->platform_data->sim_b) |
