From 47aad344c3b17bd1d6a6907b3b071807ab767428 Mon Sep 17 00:00:00 2001
From: David van Moolenbroek <david@minix3.org>
Date: Fri, 4 Nov 2011 23:54:02 +0100
Subject: [PATCH] Drivers: fix issues introduced by commit b198207

---
 drivers/ahci/ahci.c       | 1 -
 drivers/dp8390/rtl8029.c  | 2 +-
 drivers/fxp/fxp.c         | 3 +++
 drivers/lance/lance.c     | 3 +++
 drivers/rtl8139/rtl8139.c | 3 +++
 drivers/ti1225/ti1225.c   | 6 ++++++
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/ahci/ahci.c b/drivers/ahci/ahci.c
index 09bffce4c..bb2267411 100644
--- a/drivers/ahci/ahci.c
+++ b/drivers/ahci/ahci.c
@@ -106,7 +106,6 @@
 #include <minix/drivers.h>
 #include <minix/driver_mt.h>
 #include <minix/drvlib.h>
-#include <minix/u64.h>
 #include <machine/pci.h>
 #include <sys/ioc_disk.h>
 #include <sys/mman.h>
diff --git a/drivers/dp8390/rtl8029.c b/drivers/dp8390/rtl8029.c
index 6741cd25a..b0895a372 100644
--- a/drivers/dp8390/rtl8029.c
+++ b/drivers/dp8390/rtl8029.c
@@ -193,7 +193,7 @@ dpeth_t *dep;
 #endif
 	}
 
-#if DEBUG
+#if 0
 	for (i= 0; i<64; i++)
 		printf("%x ", get_ee_word(dep, i));
 	printf("\n");
diff --git a/drivers/fxp/fxp.c b/drivers/fxp/fxp.c
index dbe8b6168..96f5f2aef 100644
--- a/drivers/fxp/fxp.c
+++ b/drivers/fxp/fxp.c
@@ -632,6 +632,9 @@ static int fxp_probe(fxp_t *fp, int skip)
 static void fxp_conf_hw(fxp_t *fp)
 {
 	int mwi, ext_stat1, ext_stat2, lim_fifo, i82503, fc;
+#if VERBOSE
+	int i;
+#endif
 
 	fp->fxp_mode= FM_DISABLED;	/* Superfluous */
 
diff --git a/drivers/lance/lance.c b/drivers/lance/lance.c
index 38fb9a771..196eff086 100644
--- a/drivers/lance/lance.c
+++ b/drivers/lance/lance.c
@@ -646,6 +646,9 @@ static void ec_init(ec)
 ether_card_t *ec;
 {
    int r;
+#if VERBOSE
+   int i;
+#endif
 
    /* General initialization */
    ec->flags = ECF_EMPTY;
diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c
index 96ffeefb4..55cea9c41 100644
--- a/drivers/rtl8139/rtl8139.c
+++ b/drivers/rtl8139/rtl8139.c
@@ -461,6 +461,9 @@ int skip;
 	u16_t vid, did;
 	u32_t bar;
 	u8_t ilr;
+#if VERBOSE
+	char *dname;
+#endif
 
 	if ((rep->re_pcibus | rep->re_pcidev | rep->re_pcifunc) != 0)
 	{
diff --git a/drivers/ti1225/ti1225.c b/drivers/ti1225/ti1225.c
index e33d70967..3194fceac 100644
--- a/drivers/ti1225/ti1225.c
+++ b/drivers/ti1225/ti1225.c
@@ -187,6 +187,9 @@ PRIVATE void hw_init(struct port *pp)
 	u8_t v8;
 	u16_t v16;
 	u32_t v32;
+#if USE_INTS
+	int r, irq;
+#endif
 
 	devind= pp->p_devind;
 	if (debug)
@@ -316,6 +319,9 @@ PRIVATE void do_int(struct port *pp)
 	u32_t csr_event, csr_present, csr_control;
 	u8_t v8;
 	u16_t v16;
+#if USE_INTS
+	int r;
+#endif
 
 	devind= pp->p_devind;
 	v8= pci_attr_r8(devind, TI_CARD_CTRL);