diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:35 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:35 +0800 |
| commit | 6da6382191c30868dd8bf0624f6c2439339b7760 (patch) | |
| tree | 8d6f273d0a4db9c0651371386c67e6c4f7de98c9 /drivers/staging/Makefile | |
| parent | 06c48e022c9737a840da15fd47c7df24dc5d5b9a (diff) | |
| parent | 5c5f4d2df9e9c8eacfdab76ac8060d80c802616c (diff) | |
Merge topic branch 'wlan' into integration-linux-ux500
Diffstat (limited to 'drivers/staging/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index cf15b26c8a1..71c5803568c 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -58,3 +58,4 @@ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_PHONE) += telephony/ obj-$(CONFIG_RAMSTER) += ramster/ obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/ +obj-$(CONFIG_CW1200) += cw1200/ |