Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 3031ed9c4a1a..fa5eee925f25 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -115,7 +115,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
                           0x02,       /* phy reset sequence length */
                           0x01, 0x00, /* phy reset sequence */
                           0x00, 0x78, /* media capabilities */
-                          0x00, 0xe0, /* nway advertisment */
+                          0x00, 0xe0, /* nway advertisement */
                           0x00, 0x05, /* fdx bit map */
                           0x00, 0x06  /* ttm bit map */
                         };
@@ -222,8 +222,8 @@ subsequent_board:
                 /* there is no phy information, don't even try to build mtable */
                 if (count == 0) {
                         if (tulip_debug > 0)
-                                pr_warning("%s: no phy info, aborting mtable build\n",
-                                           dev->name);
+                                pr_warn("%s: no phy info, aborting mtable build\n",
+                                        dev->name);
                         return;
                 }