generic: b53: rename exported symbols to avoid upstream conflict

[openwrt/staging/hauke.git] / target / linux / generic / files / drivers / net / phy / b53 / b53_common.c

diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_common.c b/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
index 215a369e63eede0167f4ffdc55f1e2a2d102e6a8..d5f9bfc2f0438b0c292105ac4a1765c0daca9a6a 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
@@ -1611,8 +1611,8 @@ static int b53_switch_init(struct b53_device *dev)
        return b53_switch_reset(dev);
 }
 
-struct b53_device *b53_switch_alloc(struct device *base, struct b53_io_ops *ops,
-                                   void *priv)
+struct b53_device *b53_swconfig_switch_alloc(struct device *base, struct b53_io_ops *ops,
+                                            void *priv)
 {
        struct b53_device *dev;
 
@@ -1627,9 +1627,9 @@ struct b53_device *b53_switch_alloc(struct device *base, struct b53_io_ops *ops,
 
        return dev;
 }
-EXPORT_SYMBOL(b53_switch_alloc);
+EXPORT_SYMBOL(b53_swconfig_switch_alloc);
 
-int b53_switch_detect(struct b53_device *dev)
+int b53_swconfig_switch_detect(struct b53_device *dev)
 {
        u32 id32;
        u16 tmp;
@@ -1694,9 +1694,9 @@ int b53_switch_detect(struct b53_device *dev)
                return b53_read8(dev, B53_MGMT_PAGE, B53_REV_ID,
                                 &dev->core_rev);
 }
-EXPORT_SYMBOL(b53_switch_detect);
+EXPORT_SYMBOL(b53_swconfig_switch_detect);
 
-int b53_switch_register(struct b53_device *dev)
+int b53_swconfig_switch_register(struct b53_device *dev)
 {
        int ret;
 
@@ -1706,7 +1706,7 @@ int b53_switch_register(struct b53_device *dev)
                dev->sw_dev.alias = dev->pdata->alias;
        }
 
-       if (!dev->chip_id && b53_switch_detect(dev))
+       if (!dev->chip_id && b53_swconfig_switch_detect(dev))
                return -EINVAL;
 
        ret = b53_switch_init(dev);
@@ -1717,7 +1717,7 @@ int b53_switch_register(struct b53_device *dev)
 
        return register_switch(&dev->sw_dev, NULL);
 }
-EXPORT_SYMBOL(b53_switch_register);
+EXPORT_SYMBOL(b53_swconfig_switch_register);
 
 MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
 MODULE_DESCRIPTION("B53 switch library");