diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/microcode/atmel/Makefile | 10 | ||||
-rw-r--r-- | sys/dev/microcode/fxp/Makefile | 7 | ||||
-rw-r--r-- | sys/dev/microcode/kue/Makefile | 10 | ||||
-rw-r--r-- | sys/dev/microcode/ral/Makefile | 8 | ||||
-rw-r--r-- | sys/dev/microcode/rum/Makefile | 10 | ||||
-rw-r--r-- | sys/dev/microcode/tigon/Makefile | 7 | ||||
-rw-r--r-- | sys/dev/microcode/typhoon/Makefile | 7 | ||||
-rw-r--r-- | sys/dev/microcode/uyap/Makefile | 8 | ||||
-rw-r--r-- | sys/dev/microcode/yds/Makefile | 7 | ||||
-rw-r--r-- | sys/dev/microcode/zydas/Makefile | 10 | ||||
-rw-r--r-- | sys/dev/pci/pcivar.h | 4 |
11 files changed, 41 insertions, 47 deletions
diff --git a/sys/dev/microcode/atmel/Makefile b/sys/dev/microcode/atmel/Makefile index 5197473dbb3..da41e5a7723 100644 --- a/sys/dev/microcode/atmel/Makefile +++ b/sys/dev/microcode/atmel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.15 2007/08/01 21:42:43 deraadt Exp $ NOPROG= NOMAN= @@ -7,10 +7,10 @@ CC=${HOSTCC} # USB capable systems only .if (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "alpha") || \ (${MACHINE} == "amd64") || (${MACHINE} == "armish") || \ - (${MACHINE} == "cats") || (${MACHINE} == "hppa") || \ - (${MACHINE} == "hppa64") || (${MACHINE} == "i386") || \ - (${MACHINE} == "sgi") || (${MACHINE} == "sparc64") || \ - (${MACHINE} == "zaurus") || (${MACHINE} == "landisk") + (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ + (${MACHINE} == "i386") || (${MACHINE} == "sgi") || \ + (${MACHINE} == "sparc64") || (${MACHINE} == "zaurus") || \ + (${MACHINE} == "landisk") FIRM= atu-intersil-int atu-intersil-ext \ atu-rfmd-int atu-rfmd-ext \ diff --git a/sys/dev/microcode/fxp/Makefile b/sys/dev/microcode/fxp/Makefile index f9ecb944955..5c4283c9e36 100644 --- a/sys/dev/microcode/fxp/Makefile +++ b/sys/dev/microcode/fxp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.6 2007/08/01 21:42:43 deraadt Exp $ NOPROG= NOMAN= @@ -7,9 +7,8 @@ CC=${HOSTCC} # PCI capable systems only .if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \ (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \ - (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "cats") || \ - (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ - (${MACHINE} == "sgi") + (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "hppa") || \ + (${MACHINE} == "hppa64") || (${MACHINE} == "sgi") FIRM= fxp-d101a fxp-d101b0 fxp-d101ma fxp-d101s fxp-d102 fxp-d102c fxp-d102e diff --git a/sys/dev/microcode/kue/Makefile b/sys/dev/microcode/kue/Makefile index 54017854456..6974858edd7 100644 --- a/sys/dev/microcode/kue/Makefile +++ b/sys/dev/microcode/kue/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.8 2007/08/01 21:42:43 deraadt Exp $ NOPROG= NOMAN= @@ -7,10 +7,10 @@ CC=${HOSTCC} # USB capable systems only .if (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "alpha") || \ (${MACHINE} == "amd64") || (${MACHINE} == "armish") || \ - (${MACHINE} == "cats") || (${MACHINE} == "hppa") || \ - (${MACHINE} == "hppa64") || (${MACHINE} == "i386") || \ - (${MACHINE} == "sgi") || (${MACHINE} == "sparc64") || \ - (${MACHINE} == "zaurus") || (${MACHINE} == "landisk") + (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ + (${MACHINE} == "i386") || (${MACHINE} == "sgi") || \ + (${MACHINE} == "sparc64") || (${MACHINE} == "zaurus") || \ + (${MACHINE} == "landisk") FIRM= kue diff --git a/sys/dev/microcode/ral/Makefile b/sys/dev/microcode/ral/Makefile index 2db0afcd9e4..97ed394f10c 100644 --- a/sys/dev/microcode/ral/Makefile +++ b/sys/dev/microcode/ral/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.6 2007/08/01 21:42:43 deraadt Exp $ NOPROG= NOMAN= @@ -7,9 +7,9 @@ CC=${HOSTCC} # PCI capable systems only .if (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "alpha") || \ (${MACHINE} == "amd64") || (${MACHINE} == "armish") || \ - (${MACHINE} == "cats") || (${MACHINE} == "hppa") || \ - (${MACHINE} == "hppa64") || (${MACHINE} == "i386") || \ - (${MACHINE} == "sgi") || (${MACHINE} == "sparc64") + (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ + (${MACHINE} == "i386") || (${MACHINE} == "sgi") || \ + (${MACHINE} == "sparc64") FIRM= ral-rt2561 ral-rt2561s ral-rt2661 diff --git a/sys/dev/microcode/rum/Makefile b/sys/dev/microcode/rum/Makefile index f69e464bf96..7bf785df07a 100644 --- a/sys/dev/microcode/rum/Makefile +++ b/sys/dev/microcode/rum/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.4 2007/08/01 21:42:43 deraadt Exp $ NOPROG= NOMAN= @@ -7,10 +7,10 @@ CC=${HOSTCC} # USB capable systems only .if (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "alpha") || \ (${MACHINE} == "amd64") || (${MACHINE} == "armish") || \ - (${MACHINE} == "cats") || (${MACHINE} == "hppa") || \ - (${MACHINE} == "hppa64") || (${MACHINE} == "i386") || \ - (${MACHINE} == "sgi") || (${MACHINE} == "sparc64") || \ - (${MACHINE} == "zaurus") || (${MACHINE} == "landisk") + (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ + (${MACHINE} == "i386") || (${MACHINE} == "sgi") || \ + (${MACHINE} == "sparc64") || (${MACHINE} == "zaurus") || \ + (${MACHINE} == "landisk") FIRM= rum-rt2573 diff --git a/sys/dev/microcode/tigon/Makefile b/sys/dev/microcode/tigon/Makefile index 1c3d3692697..badb9058f71 100644 --- a/sys/dev/microcode/tigon/Makefile +++ b/sys/dev/microcode/tigon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.6 2007/08/01 21:42:43 deraadt Exp $ NOPROG= NOMAN= @@ -7,9 +7,8 @@ CC=${HOSTCC} # PCI capable systems only .if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \ (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \ - (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "cats") || \ - (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ - (${MACHINE} == "sgi") + (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "hppa") || \ + (${MACHINE} == "hppa64") || (${MACHINE} == "sgi") FIRM= tigon1 tigon2 diff --git a/sys/dev/microcode/typhoon/Makefile b/sys/dev/microcode/typhoon/Makefile index cfd665f1592..028880ae541 100644 --- a/sys/dev/microcode/typhoon/Makefile +++ b/sys/dev/microcode/typhoon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.6 2007/08/01 21:42:43 deraadt Exp $ NOPROG= NOMAN= @@ -7,9 +7,8 @@ CC=${HOSTCC} # PCI capable systems only .if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \ (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \ - (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "cats") || \ - (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ - (${MACHINE} == "sgi") + (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "hppa") || \ + (${MACHINE} == "hppa64") || (${MACHINE} == "sgi") FIRM= 3c990 diff --git a/sys/dev/microcode/uyap/Makefile b/sys/dev/microcode/uyap/Makefile index 7ad511035c6..ae24c7f1ce6 100644 --- a/sys/dev/microcode/uyap/Makefile +++ b/sys/dev/microcode/uyap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.6 2007/08/01 21:42:44 deraadt Exp $ NOPROG= NOMAN= @@ -7,9 +7,9 @@ CC=${HOSTCC} # USB capable systems only .if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \ (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \ - (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "cats") || \ - (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ - (${MACHINE} == "sgi") || (${MACHINE} == "landisk") + (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "hppa") || \ + (${MACHINE} == "hppa64") || (${MACHINE} == "sgi") || \ + (${MACHINE} == "landisk") FIRM= uyap diff --git a/sys/dev/microcode/yds/Makefile b/sys/dev/microcode/yds/Makefile index dac8c03a554..e76da6359b2 100644 --- a/sys/dev/microcode/yds/Makefile +++ b/sys/dev/microcode/yds/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.4 2007/08/01 21:42:44 deraadt Exp $ NOPROG= NOMAN= @@ -7,9 +7,8 @@ CC=${HOSTCC} # PCI capable systems only .if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \ (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \ - (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "cats") || \ - (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ - (${MACHINE} == "sgi") + (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "hppa") || \ + (${MACHINE} == "hppa64") || (${MACHINE} == "sgi") FIRM= yds diff --git a/sys/dev/microcode/zydas/Makefile b/sys/dev/microcode/zydas/Makefile index b4c6a4a9fe0..17a4d4aaa45 100644 --- a/sys/dev/microcode/zydas/Makefile +++ b/sys/dev/microcode/zydas/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/04/05 23:41:20 drahn Exp $ +# $OpenBSD: Makefile,v 1.6 2007/08/01 21:42:44 deraadt Exp $ NOPROG= NOMAN= @@ -7,10 +7,10 @@ CC=${HOSTCC} # USB capable systems only .if (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "alpha") || \ (${MACHINE} == "amd64") || (${MACHINE} == "armish") || \ - (${MACHINE} == "cats") || (${MACHINE} == "hppa") || \ - (${MACHINE} == "hppa64") || (${MACHINE} == "i386") || \ - (${MACHINE} == "sgi") || (${MACHINE} == "sparc64") || \ - (${MACHINE} == "zaurus") || (${MACHINE} == "landisk") + (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \ + (${MACHINE} == "i386") || (${MACHINE} == "sgi") || \ + (${MACHINE} == "sparc64") || (${MACHINE} == "zaurus") || \ + (${MACHINE} == "landisk") FIRM= zd1211 zd1211b diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 667d73859d7..c369df9b949 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcivar.h,v 1.53 2007/05/21 22:10:45 kettenis Exp $ */ +/* $OpenBSD: pcivar.h,v 1.54 2007/08/01 21:43:03 deraadt Exp $ */ /* $NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -71,8 +71,6 @@ struct pci_softc; #include <alpha/pci/pci_machdep.h> #elif defined(__i386__) #include <i386/pci/pci_machdep.h> -#elif defined(__cats__) -#include <cats/pci/pci_machdep.h> #elif defined(__powerpc__) #include <powerpc/pci/pci_machdep.h> #elif defined(__sgi__) |