compat-drivers: deactivate mac80211_hwsim for kernel < 2.6.31

kernel version < 2.6.31 does not support tasklet_hrtimer, so deactivate the driver there. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
TI-OpenLink · Jan 25, 2013 · 5ba6ad5 · 5ba6ad5
1 parent 63909b5
commit 5ba6ad5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/config.mk b/config.mk
@@ -256,8 +256,10 @@ ifdef CONFIG_STAGING
 export CONFIG_COMPAT_STAGING=m
 endif #CONFIG_STAGING
 
+ifndef CONFIG_COMPAT_KERNEL_2_6_31
 # mac80211 test driver
-export CONFIG_MAC80211_HWSIM=m
+export CONFIG_COMPAT_MAC80211_HWSIM=m
+endif #CONFIG_COMPAT_KERNEL_2_6_31
 
 export CONFIG_ATH5K=m
 # export CONFIG_ATH5K_DEBUG=y

diff --git a/patches/collateral-evolutions/network/08-rename-config-options.patch b/patches/collateral-evolutions/network/08-rename-config-options.patch
@@ -30,7 +30,12 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  obj-$(CONFIG_RTL8180)		+= rtl818x/
  obj-$(CONFIG_RTL8187)		+= rtl818x/
  obj-$(CONFIG_RTLWIFI)		+= rtlwifi/
-@@ -53,7 +53,7 @@ obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211
+@@ -49,11 +49,11 @@ obj-$(CONFIG_P54_COMMON)	+= p54/
+
+ obj-$(CONFIG_ATH_CARDS)		+= ath/
+
+-obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
++obj-$(CONFIG_COMPAT_MAC80211_HWSIM)	+= mac80211_hwsim.o
 
  obj-$(CONFIG_WL_TI)	+= ti/