diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-03-14 10:53:42 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-14 10:53:42 +0000 |
| commit | 705d7a8aa438a21daa646e1dc8c5d0a45295de0c (patch) | |
| tree | fc4abc713ed39e07d94d500e5f7d44cbc985f43e /package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch | |
| parent | 9b1e65073a8b1a571c390a1041bfe7fcd07d97ba (diff) | |
| download | upstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.tar.gz upstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.tar.bz2 upstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.zip | |
AA: mac80211: backport package from trunk r39886
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@39928 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch')
| -rw-r--r-- | package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch b/package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch deleted file mode 100644 index 293b71a183..0000000000 --- a/package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/drivers/net/wireless/rt2x00/rt2800pci.c -+++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -39,6 +39,7 @@ - #include <linux/pci.h> - #include <linux/platform_device.h> - #include <linux/eeprom_93cx6.h> -+#include <linux/of.h> - - #include "rt2x00.h" - #include "rt2x00mmio.h" -@@ -323,11 +324,17 @@ static int rt2800pci_write_firmware(stru - static char *rt2800pci_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev) - { - struct rt2x00_platform_data *pdata; -+ struct device_node *np; -+ char *eep; - - pdata = rt2x00dev->dev->platform_data; - if (pdata) - return pdata->eeprom_file_name; - -+ np = rt2x00dev->dev->of_node; -+ if (np && !of_property_read_string(np, "ralink,eeprom", &eep)) -+ return eep; -+ - return NULL; - } - |