diff options
| author | Bartosz Markowski <bartosz.markowski@tieto.com> | 2011-09-01 08:19:39 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:55:31 +0200 |
| commit | f52c6e8403bb8a4798c9c3cc91528dee41875ca1 (patch) | |
| tree | ca5c5358b5919327328d74cc1f9394b6ef47810d /net/Makefile | |
| parent | 21660078150c70b3643707c6efa61124e15eccfd (diff) | |
WLAN: Add symlink to compat-wireless
And disable use of wireless from kernel tree
if compat-wireless is enabled.
Depends-On: I7147b541419c684dc337e5d32b021b470dd0f344,
Ib489e754a7cf4bd79ce20955be61cae7958043e1,
Id8d0913143e58a21dbfebe187a9594a0cb7bea8a,
Ieaadb213c53d967ab5dcb293aeee088fd3efbae8,
Ie280d1b7e533d7045e4e77c0cab3d69f1180c091,
Ia40a0c011f35c3056d02d12b054f93aa86d99b47,
Ib3b5524ec3814b00a7e46f591d7715db16eec5fd
ST-Ericsson Linux next: -
ST-Ericsson ID: CR283174
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I28a1b6b32383e71f9679031bffcefff022eaadde
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16241
Tested-by: Mariusz CZAPLICKI <mariusz.czaplicki@tieto.com>
Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30002
Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/Makefile b/net/Makefile index a51d9465e62..9186c4bd78e 100644 --- a/net/Makefile +++ b/net/Makefile @@ -48,8 +48,12 @@ endif obj-$(CONFIG_IP_DCCP) += dccp/ obj-$(CONFIG_IP_SCTP) += sctp/ obj-$(CONFIG_RDS) += rds/ +ifneq ($(CONFIG_COMPAT_WIRELESS),) +obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless/ +else obj-$(CONFIG_WIRELESS) += wireless/ obj-$(CONFIG_MAC80211) += mac80211/ +endif obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_NETLABEL) += netlabel/ obj-$(CONFIG_IUCV) += iucv/ |