Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/skfp/h/supern_2.h b/drivers/net/skfp/h/supern_2.h
index 5ba0b8306753..0b73690280f6 100644
--- a/drivers/net/skfp/h/supern_2.h
+++ b/drivers/net/skfp/h/supern_2.h
@@ -14,7 +14,7 @@
 
 /*
         defines for AMD Supernet II chip set
-        the chips are refered to as
+        the chips are referred to as
                 FPLUS   Formac Plus
                 PLC     Physical Layer
 
@@ -386,7 +386,7 @@ struct tx_queue {
 #define FM_MDISRCV      (4<<8)          /* disable receive function */
 #define FM_MRES0        (5<<8)          /* reserve */
 #define FM_MLIMPROM     (6<<8)          /* limited-promiscuous mode */
-#define FM_MPROMISCOUS  (7<<8)          /* address detection : promiscous */
+#define FM_MPROMISCOUS  (7<<8)          /* address detection : promiscuous */
 
 #define FM_SELSA        0x0800          /* select-short-address bit */