diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
commit | 033e30653835c5c3fc785ab60e6a110203e6241d (patch) | |
tree | fbb575df1204e3d44fd1262af721bae206fc848e /target/linux/patches/3.15-rc6/lemote-rfkill.patch | |
parent | 8f3142f161895b5fb02c12d1a4a6e5eec8e861d6 (diff) |
resolve merge
Diffstat (limited to 'target/linux/patches/3.15-rc6/lemote-rfkill.patch')
-rw-r--r-- | target/linux/patches/3.15-rc6/lemote-rfkill.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/patches/3.15-rc6/lemote-rfkill.patch b/target/linux/patches/3.15-rc6/lemote-rfkill.patch new file mode 100644 index 000000000..a61488434 --- /dev/null +++ b/target/linux/patches/3.15-rc6/lemote-rfkill.patch @@ -0,0 +1,21 @@ +diff -Nur linux-3.3.orig/drivers/net/wireless/rtl818x/rtl8187/rfkill.c linux-3.3/drivers/net/wireless/rtl818x/rtl8187/rfkill.c +--- linux-3.3.orig/drivers/net/wireless/rtl818x/rtl8187/rfkill.c 2012-03-19 00:15:34.000000000 +0100 ++++ linux-3.3/drivers/net/wireless/rtl818x/rtl8187/rfkill.c 2012-03-27 23:29:46.000000000 +0200 +@@ -22,6 +22,9 @@ + + static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv) + { ++#ifdef CONFIG_LEMOTE_MACH2F ++ return 1; ++#else + u8 gpio; + + gpio = rtl818x_ioread8(priv, &priv->map->GPIO0); +@@ -29,6 +32,7 @@ + gpio = rtl818x_ioread8(priv, &priv->map->GPIO1); + + return gpio & priv->rfkill_mask; ++#endif + } + + void rtl8187_rfkill_init(struct ieee80211_hw *hw) |