diff options
| author | Bartosz Markowski <bartosz.markowski@tieto.com> | 2011-09-01 08:38:50 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:05:58 +0200 |
| commit | 4177d232fc0bcf6fc28de011444bb5c96444fd31 (patch) | |
| tree | 61c769ab42c6411aaa676acb6974494bf9b49412 /net/Makefile | |
| parent | 9b05a8ad87e490021d9e59bbe33978d0949787b0 (diff) | |
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 <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/28667
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30004
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
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/ |