summaryrefslogtreecommitdiff
path: root/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-04-12 11:59:07 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-04-12 11:59:07 +0000
commitd2812cb036585a9dfe3147e691b4ec3dc3a188d8 (patch)
treeb6c8c1de129dfd7a840c57a803912a693693e469 /target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
parent17f848538cb9d219533e485642514d4085766604 (diff)
downloadmtk-20170518-d2812cb036585a9dfe3147e691b4ec3dc3a188d8.zip
mtk-20170518-d2812cb036585a9dfe3147e691b4ec3dc3a188d8.tar.gz
mtk-20170518-d2812cb036585a9dfe3147e691b4ec3dc3a188d8.tar.bz2
kernel: update 3.10 to 3.10.36
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 40467
Diffstat (limited to 'target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch')
-rw-r--r--target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch b/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
index cf95b8d..8ec9ff4 100644
--- a/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
+++ b/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
@@ -1,8 +1,6 @@
-Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
-===================================================================
---- linux-3.10.34.orig/arch/mips/lantiq/xway/ath_eep.c 2014-04-03 13:25:03.128464891 +0100
-+++ linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c 2014-04-03 13:35:30.432482868 +0100
-@@ -36,10 +36,11 @@
+--- a/arch/mips/lantiq/xway/ath_eep.c
++++ b/arch/mips/lantiq/xway/ath_eep.c
+@@ -36,10 +36,11 @@ static int ath9k_pci_plat_dev_init(struc
return 0;
}
@@ -15,7 +13,7 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
u32 mac_inc = 0, pci_slot = 0;
int i;
struct mtd_info *the_mtd;
-@@ -112,6 +113,18 @@
+@@ -112,6 +113,18 @@ int __init of_ath9k_eeprom_probe(struct
if (!of_property_read_u32(np, "ath,pci-slot", &pci_slot)) {
ltq_pci_ath_fixup(pci_slot, ath9k_pdata.eeprom_data);
dev_info(&pdev->dev, "pci slot: %u\n", pci_slot);
@@ -34,7 +32,7 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
}
dev_info(&pdev->dev, "loaded ath9k eeprom\n");
-@@ -132,20 +145,19 @@
+@@ -132,20 +145,19 @@ static struct platform_driver ath9k_eepr
},
};
@@ -58,7 +56,7 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
return 0;
return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
}
-@@ -247,4 +259,4 @@
+@@ -247,4 +259,4 @@ static int __init of_ath5k_eeprom_init(v
{
return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe);
}