summaryrefslogtreecommitdiff
path: root/drivers/net/wan/lmc/lmc_var.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-10-27 08:46:20 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-10-27 08:46:20 +0400
commit6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (patch)
tree05aff14f02776bc0d59a1f777cb92df6f4456ba9 /drivers/net/wan/lmc/lmc_var.h
parentd6069dae4700cf5290a75002c46b9be8ea7eef3c (diff)
parent3f48e7354358519e5b93f7f755ec270b3f8eafa0 (diff)
downloadlinux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.tar.xz
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/net/wan/lmc/lmc_var.h')
-rw-r--r--drivers/net/wan/lmc/lmc_var.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/lmc/lmc_var.h b/drivers/net/wan/lmc/lmc_var.h
index 01ad45218d19..a1d202d8ad67 100644
--- a/drivers/net/wan/lmc/lmc_var.h
+++ b/drivers/net/wan/lmc/lmc_var.h
@@ -380,7 +380,7 @@ struct lmc___softc {
/* CSR6 settings */
#define OPERATION_MODE 0x00000200 /* Full Duplex */
#define PROMISC_MODE 0x00000040 /* Promiscuous Mode */
-#define RECIEVE_ALL 0x40000000 /* Receive All */
+#define RECEIVE_ALL 0x40000000 /* Receive All */
#define PASS_BAD_FRAMES 0x00000008 /* Pass Bad Frames */
/* Dec control registers CSR6 as well */