diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
commit | da032a4fe0515a97dbad6a0f18e20c058062d38c (patch) | |
tree | 8d99340add217d9831810232b418635ccfaf8287 /package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch | |
parent | 7467c1380b0aa1d287b9cecacab7351a65696da8 (diff) | |
download | master-187ad058-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.gz master-187ad058-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.bz2 master-187ad058-da032a4fe0515a97dbad6a0f18e20c058062d38c.zip |
mac80211: merge a big batch of upstream changes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37918 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch')
-rw-r--r-- | package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch index 120fc4c1fc..074c3d8ebb 100644 --- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch +++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -729,6 +729,7 @@ int ath9k_hw_init(struct ath_hw *ah) +@@ -728,6 +728,7 @@ int ath9k_hw_init(struct ath_hw *ah) case AR9300_DEVID_AR9462: case AR9485_DEVID_AR1111: case AR9300_DEVID_AR9565: @@ -20,7 +20,7 @@ --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -139,6 +139,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i +@@ -270,6 +270,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i { PCI_VDEVICE(ATHEROS, 0x0034) }, /* PCI-E AR9462 */ { PCI_VDEVICE(ATHEROS, 0x0037) }, /* PCI-E AR1111/AR9485 */ { PCI_VDEVICE(ATHEROS, 0x0036) }, /* PCI-E AR9565 */ |