V4L/DVB (9540): dsbr100: add disabled controls and fix version

[safe/jmp/linux-2.6] / drivers / net / chelsio / mv88e1xxx.c

diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/chelsio/mv88e1xxx.c
index 5867e3b..0632be0 100644 (file)
--- a/drivers/net/chelsio/mv88e1xxx.c
+++ b/drivers/net/chelsio/mv88e1xxx.c
@@ -354,7 +354,7 @@ static struct cphy_ops mv88e1xxx_ops = {
 };
 
 static struct cphy *mv88e1xxx_phy_create(adapter_t *adapter, int phy_addr,
-                                        struct mdio_ops *mdio_ops)
+                                        const struct mdio_ops *mdio_ops)
 {
        struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL);
 
@@ -390,7 +390,7 @@ static int mv88e1xxx_phy_reset(adapter_t* adapter)
        return 0;
 }
 
-struct gphy t1_mv88e1xxx_ops = {
-       mv88e1xxx_phy_create,
-       mv88e1xxx_phy_reset
+const struct gphy t1_mv88e1xxx_ops = {
+       .create = mv88e1xxx_phy_create,
+       .reset =  mv88e1xxx_phy_reset
 };