diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1999-07-03 20:17:08 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1999-07-03 20:17:08 +0000 |
| commit | 9929d2a04579258af0adcb0b3ca952b9c06f13ad (patch) | |
| tree | a98bed25eeef8ed0c373e4e285129b7d14937824 /sys/dev/bktr | |
| parent | 279f2101e732045b16d5fa11c0e0f1b6730be6a7 (diff) | |
Notes
Diffstat (limited to 'sys/dev/bktr')
| -rw-r--r-- | sys/dev/bktr/bktr_core.c | 7 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_i2c.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index 23ccdeaf9d74..1394defe3e34 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $Id: brooktree848.c,v 1.85 1999/06/12 14:54:54 roger Exp $ */ +/* $Id: brooktree848.c,v 1.86 1999/06/13 16:05:00 roger Exp $ */ /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and Jim Lowe's driver for the Matrox Meteor PCI card . The @@ -438,7 +438,6 @@ They are unrelated to Revision Control numbering of FreeBSD or any other system. #include "bktr.h" #include "opt_bktr.h" #include "opt_devfs.h" -#include "pci.h" #include "smbus.h" #endif /* __FreeBSD__ */ @@ -447,7 +446,7 @@ They are unrelated to Revision Control numbering of FreeBSD or any other system. #define NSMBUS 0 #endif -#if !defined(__FreeBSD__) || ((NBKTR > 0) && (NPCI > 0)) +#if !defined(__FreeBSD__) || (NBKTR > 0) #include <sys/param.h> #include <sys/systm.h> @@ -7040,7 +7039,7 @@ static void msp_autodetect( bktr_ptr_t bktr ) { /* msp_write(bktr, 0x12, 0x0014, 0x7f40); */ } -#endif /* !defined(__FreeBSD__) || (NBKTR > 0 && NPCI > 0) */ +#endif /* !defined(__FreeBSD__) || (NBKTR > 0) */ /* Local Variables: */ /* mode: C */ diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c index 8aa2de0cf19b..eec0642de1df 100644 --- a/sys/dev/bktr/bktr_i2c.c +++ b/sys/dev/bktr/bktr_i2c.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt848_i2c.c,v 1.3 1999/05/08 21:59:38 dfr Exp $ + * $Id: bt848_i2c.c,v 1.4 1999/05/10 10:08:05 roger Exp $ * */ @@ -33,11 +33,10 @@ * From brooktree848.c <fsmp@freefall.org> */ -#include "pci.h" #include "bktr.h" #include "smbus.h" -#if (NBKTR > 0 && NPCI > 0 && NSMBUS > 0) +#if (NBKTR > 0 && NSMBUS > 0) #include <sys/param.h> #include <sys/kernel.h> |