From ed37c8743ee0195b5ba83bf14ee58676b163f54c Mon Sep 17 00:00:00 2001
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Fri, 22 Jun 2001 01:02:41 +0000
Subject: Move check against CAM_NEW_TRAN_CODE ahead of the file that might
 include the option file that would define it.

---
 sys/dev/aic7xxx/aic7xxx_freebsd.h | 7 ++++---
 sys/dev/aic7xxx/aic7xxx_osm.h     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/aic7xxx/aic7xxx_freebsd.h b/sys/dev/aic7xxx/aic7xxx_freebsd.h
index b2bf917bde0a..f90caba3443b 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 b2bf917bde0a..f90caba3443b 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)
-- 
cgit v1.3