diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-01-30 13:21:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-01-30 13:21:36 +0000 |
commit | 9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6 (patch) | |
tree | 5f1204562d95c9f8f15137504a36ba3ded669320 /package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch | |
parent | fdd820a54af9158b95ecfbb2209d6f3a934cf265 (diff) | |
download | upstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.tar.gz upstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.tar.bz2 upstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.zip |
mac80211: update to wireless-testing 2014-01-23
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch')
-rw-r--r-- | package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch b/package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch index 666bc2dc55..4bc6f37adb 100644 --- a/package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch +++ b/package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch @@ -8,12 +8,14 @@ #include "rt2x00.h" #include "rt2x00lib.h" -@@ -34,11 +35,19 @@ static const char * +@@ -34,11 +35,21 @@ static const char * rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev) { struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data; ++#ifdef CONFIG_OF + struct device_node *np; -+ char *eep; ++ const char *eep; ++#endif if (pdata && pdata->eeprom_file_name) return pdata->eeprom_file_name; |