diff -u -p -B -r1.1.1.1 e100_phy.c
--- linux-2.6.0-test11/drivers/net/e100/e100_phy.c 28 Nov 2003 18:03:05 -0000 1.1.1.1
+++ linux-2.6.0-test11/drivers/net/e100/e100_phy.c 29 Nov 2003 05:39:53 -0000
@@ -132,7 +132,7 @@ e100_mdi_read(struct e100_private *bdp,
}
}
-static unsigned char __devinit
+static unsigned char
e100_phy_valid(struct e100_private *bdp, unsigned int phy_address)
{
u16 ctrl_reg, stat_reg;
@@ -150,7 +150,7 @@ e100_phy_valid(struct e100_private *bdp,
return true;
}
-static void __devinit
+static void
e100_phy_address_detect(struct e100_private *bdp)
{
unsigned int addr;