diff options
| author | John Crispin <john@openwrt.org> | 2014-04-23 07:52:37 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-04-23 07:52:37 +0000 |
| commit | ca27248c9f131f2d1528e405f7a51d92dc4885f0 (patch) | |
| tree | b244bc79b41621d1d5fdb4b077c22629f87987e5 /package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | |
| parent | 8be12510c972e15690b4e4c0cf78d6ea5f233ed2 (diff) | |
| download | upstream-ca27248c9f131f2d1528e405f7a51d92dc4885f0.tar.gz upstream-ca27248c9f131f2d1528e405f7a51d92dc4885f0.tar.bz2 upstream-ca27248c9f131f2d1528e405f7a51d92dc4885f0.zip | |
mac80211: refresh rt2x00 patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 40559
Diffstat (limited to 'package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch index 3d7a94514b..c7d71e2c73 100644 --- a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch +++ b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch @@ -48,16 +48,16 @@ obj-$(CPTCFG_RT2X00_LIB_MMIO) += rt2x00mmio.o --- a/drivers/net/wireless/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/rt2x00/rt2800lib.h -@@ -20,6 +20,8 @@ - #ifndef RT2800LIB_H - #define RT2800LIB_H +@@ -43,6 +43,8 @@ struct rt2800_drv_data { + } shmem_lock; + }; +#include "rt2800.h" + struct rt2800_ops { void (*register_read)(struct rt2x00_dev *rt2x00dev, const unsigned int offset, u32 *value); -@@ -119,6 +121,15 @@ static inline int rt2800_read_eeprom(str +@@ -176,6 +178,15 @@ static inline int rt2800_read_eeprom(str { const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv; @@ -75,7 +75,7 @@ --- a/drivers/net/wireless/rt2x00/rt2800soc.c +++ b/drivers/net/wireless/rt2x00/rt2800soc.c -@@ -95,19 +95,6 @@ static int rt2800soc_set_device_state(st +@@ -102,19 +102,6 @@ static int rt2800soc_set_device_state(st return retval; } @@ -95,7 +95,7 @@ /* Firmware functions */ static char *rt2800soc_get_firmware_name(struct rt2x00_dev *rt2x00dev) { -@@ -171,7 +158,6 @@ static const struct rt2800_ops rt2800soc +@@ -178,7 +165,6 @@ static const struct rt2800_ops rt2800soc .register_multiread = rt2x00mmio_register_multiread, .register_multiwrite = rt2x00mmio_register_multiwrite, .regbusy_read = rt2x00mmio_regbusy_read, |