Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / drivers / net / at1700.c

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index f4744fc..65a78f9 100644 (file)
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -133,7 +133,7 @@ struct net_local {
 /* Run-time register bank 2 definitions. */
 #define DATAPORT               8               /* Word-wide DMA or programmed-I/O dataport. */
 #define TX_START               10
-#define COL16CNTL              11              /* Controll Reg for 16 collisions */
+#define COL16CNTL              11              /* Control Reg for 16 collisions */
 #define MODE13                 13
 #define RX_CTRL                        14
 /* Configuration registers only on the '865A/B chips. */