Seems a couple of lines in smctr.h had gotten stuck together. Also, smctr.c
needed a prototype for udelay().
p.
--- linux/drivers/net/tokenring/smctr.h Sun Feb 6 12:28:28 2000
+++ linux/drivers/net/tokenring/smctr.h Mon Apr 24 14:04:45 2000
@@ -1382,7 +1382,8 @@
* Definitions for the field:
* bic_type (Bus interface chip type)
*/
-#define BIC_NO_CHIP 0x0000 /* Bus interface chip not implemented */#define BIC_583_CHIP 0x0001 /* 83C583 bus interface chip */
+#define BIC_NO_CHIP 0x0000 /* Bus interface chip not implemented */
+#define BIC_583_CHIP 0x0001 /* 83C583 bus interface chip */
#define BIC_584_CHIP 0x0002 /* 83C584 bus interface chip */
#define BIC_585_CHIP 0x0003 /* 83C585 bus interface chip */
#define BIC_593_CHIP 0x0004 /* 83C593 bus interface chip */
@@ -1486,7 +1487,8 @@
#define MAX_8023_SIZE 1500 /* Max 802.3 size of frame. */
#define DEFAULT_ERX_VALUE 4 /* Number of 16-byte blocks for 790B early Rx. */
-#define DEFAULT_ETX_VALUE 32 /* Number of bytes for 790B early Tx. */#define DEFAULT_TX_RETRIES 3 /* Number of transmit retries */
+#define DEFAULT_ETX_VALUE 32 /* Number of bytes for 790B early Tx. */
+#define DEFAULT_TX_RETRIES 3 /* Number of transmit retries */
#define LPBK_FRAME_SIZE 1024 /* Default loopback frame for Rx calibration test. */
#define MAX_LOOKAHEAD_SIZE 252 /* Max lookahead size for ethernet. */
--- linux/drivers/net/tokenring/smctr.c Sun Feb 13 19:21:19 2000
+++ linux/drivers/net/tokenring/smctr.c Mon Apr 24 14:05:33 2000
@@ -49,6 +49,7 @@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/mca.h>
+#include <linux/delay.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Apr 30 2000 - 21:00:07 EST