include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[net-next-2.6.git] / drivers / net / phy / lxt.c

diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index bef79e454c337c0c3d9bf5b1f365be56470b94a9..057ecaacde6b77fa275b0805aced7259c652724d 100644 (file)
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -13,13 +13,10 @@
  * option) any later version.
  *
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/unistd.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -123,9 +120,9 @@ static int lxt971_config_intr(struct phy_device *phydev)
 }
 
 static struct phy_driver lxt970_driver = {
-       .phy_id         = 0x07810000,
+       .phy_id         = 0x78100000,
        .name           = "LXT970",
-       .phy_id_mask    = 0x0fffffff,
+       .phy_id_mask    = 0xfffffff0,
        .features       = PHY_BASIC_FEATURES,
        .flags          = PHY_HAS_INTERRUPT,
        .config_init    = lxt970_config_init,
@@ -137,9 +134,9 @@ static struct phy_driver lxt970_driver = {
 };
 
 static struct phy_driver lxt971_driver = {
-       .phy_id         = 0x0001378e,
+       .phy_id         = 0x001378e0,
        .name           = "LXT971",
-       .phy_id_mask    = 0x0fffffff,
+       .phy_id_mask    = 0xfffffff0,
        .features       = PHY_BASIC_FEATURES,
        .flags          = PHY_HAS_INTERRUPT,
        .config_aneg    = genphy_config_aneg,