summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2000-09-03 05:54:40 +0000
committerpeter <peter@FreeBSD.org>2000-09-03 05:54:40 +0000
commit5b3b8d25cc23586dfc44bdc2d8ae7d727cdd6522 (patch)
tree5251b42582708bf4b2ded1124f7189c85633a0f0
parente9cfe405766f0fc915629b1216b908b1ddcd07c8 (diff)
downloadFreeBSD-src-5b3b8d25cc23586dfc44bdc2d8ae7d727cdd6522.zip
FreeBSD-src-5b3b8d25cc23586dfc44bdc2d8ae7d727cdd6522.tar.gz
Replace previous change by a move of a #include since something else
#includes "smbus.h". There is still some bogus (but harmless) stuff here surrounding the #include <sys/bus.h> includes here and elsewhere in the bktr code.
-rw-r--r--sys/dev/bktr/bktr_os.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 5697f46..eecc949 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -50,7 +50,6 @@
#ifdef __FreeBSD__
#include "bktr.h"
-#include "smbus.h"
#endif /* __FreeBSD__ */
#include "opt_bktr.h" /* include any kernel config options */
@@ -100,10 +99,6 @@
#include <pci/pcivar.h>
#include <pci/pcireg.h>
-#if (NSMBUS > 0)
-#include <dev/bktr/bktr_i2c.h>
-#endif
-
#include <sys/sysctl.h>
int bt848_card = -1;
int bt848_tuner = -1;
@@ -189,6 +184,9 @@ int bktr_debug = 0;
#include <dev/bktr/bktr_audio.h>
#include <dev/bktr/bktr_core.h>
#include <dev/bktr/bktr_os.h>
+#if (NSMBUS > 0)
+#include <dev/bktr/bktr_i2c.h>
+#endif
#endif
OpenPOWER on IntegriCloud