diff options
| author | imp <imp@FreeBSD.org> | 2003-08-22 05:54:52 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-08-22 05:54:52 +0000 |
| commit | c23aaeeba46cfb112bb22a74c0898470331d3e18 (patch) | |
| tree | 633ff3cbdbfdb63210ca731968f72ea813a82ed7 /sys/dev/aic7xxx | |
| parent | 15f81fe316b4b7defea9d5f5127ba0853ed8bfcd (diff) | |
| download | FreeBSD-src-c23aaeeba46cfb112bb22a74c0898470331d3e18.zip FreeBSD-src-c23aaeeba46cfb112bb22a74c0898470331d3e18.tar.gz | |
Prefer new location of pci include files (which have only been in the
tree for two or more years now), except in a few places where there's
code to be compatible with older versions of FreeBSD.
Diffstat (limited to 'sys/dev/aic7xxx')
| -rw-r--r-- | sys/dev/aic7xxx/aic79xx_osm.h | 7 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_osm.h | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h index 681c10d..80a0b8c 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.h +++ b/sys/dev/aic7xxx/aic79xx_osm.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#20 $ + * $Id: aic79xx_osm.h,v 1.11 2003/07/01 15:51:52 scottl Exp $ * * $FreeBSD$ */ @@ -61,8 +61,13 @@ #include <sys/rman.h> +#if __FreeBSD_version >= 500000 +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> +#else #include <pci/pcireg.h> #include <pci/pcivar.h> +#endif #include <cam/cam.h> #include <cam/cam_ccb.h> diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h index 952a605..9fbb905 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.h +++ b/sys/dev/aic7xxx/aic7xxx_osm.h @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx_osm.h,v 1.22 2003/06/10 03:25:24 gibbs Exp $ + * $Id: aic7xxx_osm.h,v 1.23 2003/07/01 15:51:52 scottl Exp $ * * $FreeBSD$ */ @@ -69,8 +69,13 @@ #include <sys/rman.h> #if NPCI > 0 +#if __FreeBSD_version < 500000 #include <pci/pcireg.h> #include <pci/pcivar.h> +#else +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> +#endif #endif #include <cam/cam.h> |
