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/Kconfig | |
| parent | 06c48e022c9737a840da15fd47c7df24dc5d5b9a (diff) | |
| parent | 5c5f4d2df9e9c8eacfdab76ac8060d80c802616c (diff) | |
Merge topic branch 'wlan' into integration-linux-ux500
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 9d25de80239..ed08bf1d97f 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -134,4 +134,6 @@ source "drivers/staging/ramster/Kconfig" source "drivers/staging/ozwpan/Kconfig" +source "drivers/staging/cw1200/Kconfig" + endif # STAGING |