From 2a3fb485f942d93eaedec0d729711f73e2d1d93f Mon Sep 17 00:00:00 2001 From: Roger Hardiman Date: Mon, 10 May 1999 10:08:05 +0000 Subject: [PATCH] Add #if (NSMBUS>0) checks around smbus/iicbus i2c bus code. --- sys/dev/bktr/bktr_i2c.c | 11 +++++++---- sys/pci/bt848_i2c.c | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c index 63ea8d05038..8aa2de0cf19 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.2 1998/11/07 14:30:48 nsouch Exp $ + * $Id: bt848_i2c.c,v 1.3 1999/05/08 21:59:38 dfr Exp $ * */ @@ -33,6 +33,12 @@ * From brooktree848.c */ +#include "pci.h" +#include "bktr.h" +#include "smbus.h" + +#if (NBKTR > 0 && NPCI > 0 && NSMBUS > 0) + #include #include #include @@ -61,10 +67,7 @@ #include "iicbb_if.h" #include "smbus_if.h" -#include "pci.h" -#include "bktr.h" -#if (NBKTR > 0 && NPCI > 0) #define I2C_DELAY 40 diff --git a/sys/pci/bt848_i2c.c b/sys/pci/bt848_i2c.c index 63ea8d05038..8aa2de0cf19 100644 --- a/sys/pci/bt848_i2c.c +++ b/sys/pci/bt848_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.2 1998/11/07 14:30:48 nsouch Exp $ + * $Id: bt848_i2c.c,v 1.3 1999/05/08 21:59:38 dfr Exp $ * */ @@ -33,6 +33,12 @@ * From brooktree848.c */ +#include "pci.h" +#include "bktr.h" +#include "smbus.h" + +#if (NBKTR > 0 && NPCI > 0 && NSMBUS > 0) + #include #include #include @@ -61,10 +67,7 @@ #include "iicbb_if.h" #include "smbus_if.h" -#include "pci.h" -#include "bktr.h" -#if (NBKTR > 0 && NPCI > 0) #define I2C_DELAY 40