diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:31 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:31 +0200 |
| commit | 5c807f98e94548dac3fcbd391389c0869f8a9f32 (patch) | |
| tree | d8b652c2d428b78f7bdfd890102b5a5ca2628093 /drivers/staging/Kconfig | |
| parent | fe07b033c06f6f5e9bda543da22cfa7962325e56 (diff) | |
| parent | bd6a3784c37447e7336759ff4910f6cd3ff89f34 (diff) | |
Merge topic branch 'wlan' into integration-linux-ux500-3.3
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 7026df85dac..31c0036ad0b 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -130,4 +130,6 @@ source "drivers/staging/omapdrm/Kconfig" source "drivers/staging/android/Kconfig" +source "drivers/staging/cw1200/Kconfig" + endif # STAGING |