From 4177d232fc0bcf6fc28de011444bb5c96444fd31 Mon Sep 17 00:00:00 2001 From: Bartosz Markowski Date: Thu, 1 Sep 2011 08:38:50 +0200 Subject: WLAN: OpenMAC delivery This patch add internal support for openMAC driver from compat-wireless-openmac git. Internal only, for customer deliveries changes should be made in defconfig and Kconfig accordingly to what's done now via script called from Android.mk Only one (UMAC or openMAC based) solution should be delivered to customers. ST-Ericsson ID: 355582 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: Idd0081cc327faf64131f29a3f3a54fd6d670acf2 Signed-off-by: Bartosz Markowski Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/28667 Reviewed-by: Linus WALLEIJ Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30004 --- net/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'net/Makefile') diff --git a/net/Makefile b/net/Makefile index 87cfc364a68..b6d42169585 100644 --- a/net/Makefile +++ b/net/Makefile @@ -49,7 +49,12 @@ obj-$(CONFIG_IP_DCCP) += dccp/ obj-$(CONFIG_IP_SCTP) += sctp/ obj-$(CONFIG_RDS) += rds/ ifneq ($(CONFIG_COMPAT_WIRELESS),) -obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless/ +# If MAC80211 is disabled use UMAC +ifneq ($(CONFIG_MAC80211),) +obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless-openmac/ +else +obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless/ +endif else obj-$(CONFIG_WIRELESS) += wireless/ obj-$(CONFIG_MAC80211) += mac80211/ -- cgit v1.2.3