diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-04-03 10:17:19 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-04-03 10:17:19 +0000 |
| commit | 7b4b102eb1459148848a9d17485424ed2c584ddc (patch) | |
| tree | ff8cbf6a5ebcb9cfb5b7dc38ddea2f726a49b083 /conf | |
| parent | 3196f9094786577aaf1b87f8d7bf2de9323d4b2f (diff) | |
| parent | 843415ddd33228b986bea759c09c89d3782e2f47 (diff) | |
merge of '66dfc103d9012180e06c8ddc348f24c9120e141a'
and '85f4d68da1f7568b055435a5abec3a484fec19bd'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 12f663ae4b..e3608c3ddc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -472,5 +472,6 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}" + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" |