aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.35/971-cpmac_cleanup.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-17 18:39:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-17 18:39:38 +0000
commitf5d3d0e7d8372eb90f8e7db528b9e220fab56347 (patch)
treeac82daf3c891cec2be46b2114923dcb96bddf2c6 /target/linux/ar7/patches-2.6.35/971-cpmac_cleanup.patch
parent64f67b9c2a7853840fc4d0a44b2b4430d256014c (diff)
downloadupstream-f5d3d0e7d8372eb90f8e7db528b9e220fab56347.tar.gz
upstream-f5d3d0e7d8372eb90f8e7db528b9e220fab56347.tar.bz2
upstream-f5d3d0e7d8372eb90f8e7db528b9e220fab56347.zip
ar7: remove patches/configs for old kernel versions
SVN-Revision: 26707
Diffstat (limited to 'target/linux/ar7/patches-2.6.35/971-cpmac_cleanup.patch')
-rw-r--r--target/linux/ar7/patches-2.6.35/971-cpmac_cleanup.patch69
1 files changed, 0 insertions, 69 deletions
diff --git a/target/linux/ar7/patches-2.6.35/971-cpmac_cleanup.patch b/target/linux/ar7/patches-2.6.35/971-cpmac_cleanup.patch
deleted file mode 100644
index 99e8fbe8d9..0000000000
--- a/target/linux/ar7/patches-2.6.35/971-cpmac_cleanup.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -34,7 +34,6 @@
- #include <linux/skbuff.h>
- #include <linux/mii.h>
- #include <linux/phy.h>
--#include <linux/phy_fixed.h>
- #include <linux/platform_device.h>
- #include <linux/dma-mapping.h>
- #include <linux/clk.h>
-@@ -1108,8 +1107,6 @@ static const struct net_device_ops cpmac
- .ndo_set_mac_address = eth_mac_addr,
- };
-
--static int external_switch;
--
- static int __devinit cpmac_probe(struct platform_device *pdev)
- {
- int rc, phy_id;
-@@ -1121,24 +1118,18 @@ static int __devinit cpmac_probe(struct
-
- pdata = pdev->dev.platform_data;
-
-- if (external_switch || dumb_switch) {
-- strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
-- phy_id = pdev->id;
-- } else {
-- for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
-- if (!(pdata->phy_mask & (1 << phy_id)))
-- continue;
-- if (!cpmac_mii->phy_map[phy_id])
-- continue;
-- strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
-- break;
-- }
-+ for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
-+ if (!(pdata->phy_mask & (1 << phy_id)))
-+ continue;
-+ if (!cpmac_mii->phy_map[phy_id])
-+ continue;
-+ strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
-+ break;
- }
-
- if (phy_id == PHY_MAX_ADDR) {
-- dev_err(&pdev->dev, "no PHY present, falling back to switch on MDIO bus 0\n");
-- strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
-- phy_id = pdev->id;
-+ dev_err(&pdev->dev, "no PHY present\n");
-+ return -ENODEV;
- }
-
- dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
-@@ -1266,14 +1257,8 @@ int __devinit cpmac_init(void)
- else
- msleep(10);
-
-- mask &= 0x7fffffff;
-- if (mask & (mask - 1)) {
-- external_switch = 1;
-- mask = 0;
-- }
--
- cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
-- ~(mask | 0x80000001);
-+ ~(mask | 0x80000000);
- snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
-
- res = mdiobus_register(cpmac_mii);