Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / net / tulip / eeprom.c

diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 6002e65..296486b 100644 (file)
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -115,13 +115,13 @@ 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 */
                        };
 
-               tp->mtable = (struct mediatable *)
-                       kmalloc(sizeof(struct mediatable) + sizeof(struct medialeaf), GFP_KERNEL);
+               tp->mtable = kmalloc(sizeof(struct mediatable) +
+                                    sizeof(struct medialeaf), GFP_KERNEL);
 
                if (tp->mtable == NULL)
                        return; /* Horrible, impossible failure. */
@@ -227,9 +227,9 @@ subsequent_board:
                        return;
                }
 
-               mtable = (struct mediatable *)
-                       kmalloc(sizeof(struct mediatable) + count*sizeof(struct medialeaf),
-                                       GFP_KERNEL);
+               mtable = kmalloc(sizeof(struct mediatable) +
+                                count * sizeof(struct medialeaf),
+                                GFP_KERNEL);
                if (mtable == NULL)
                        return;                         /* Horrible, impossible failure. */
                last_mediatable = tp->mtable = mtable;