aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-07-16 07:17:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-07-16 07:17:33 +0000
commitf525229e355fdde808d6bf1fc0925ca589a59920 (patch)
treeac301ba322d77f069956731bc4c5cd284377c49c
parent738e337aa1003cf071035092bfe78f1cdf2d9e09 (diff)
downloadupstream-f525229e355fdde808d6bf1fc0925ca589a59920.tar.gz
upstream-f525229e355fdde808d6bf1fc0925ca589a59920.tar.bz2
upstream-f525229e355fdde808d6bf1fc0925ca589a59920.zip
AA: mac80211: delete the rt2x00 clk patch again
It is only required for newer kernels Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37365 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch b/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
deleted file mode 100644
index 9438d38bbf..0000000000
--- a/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -38,6 +38,7 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
-+#include <linux/clk.h>
-
- #include "rt2x00.h"
- #include "rt2800lib.h"
-@@ -6417,13 +6418,14 @@ static int rt2800_probe_rt(struct rt2x00
-
- int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
- {
-- struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
- struct hw_mode_spec *spec = &rt2x00dev->spec;
-+ struct clk *clk = clk_get(rt2x00dev->dev, NULL);
-
-- if (!pdata)
-- return -EINVAL;
-+ if (IS_ERR(clk))
-+ return PTR_ERR(clk);
-
-- spec->clk_is_20mhz = pdata->clk_is_20mhz;
-+ if (clk_get_rate(clk) == 20000000)
-+ spec->clk_is_20mhz = 1;
-
- return 0;
- }