diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:33 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:33 +0800 |
| commit | 6c6c532c86bc2f335eed1537e6144266a114a4e9 (patch) | |
| tree | 3ae08a960f8f443e1a3c90e0744b0b53be4f4de7 /drivers/staging/Kconfig | |
| parent | 5a5c0904d7eab2f2ce51419fbcd4e63247413d16 (diff) | |
| parent | c6edd75a89500109ee7a6baf929ac8748b077124 (diff) | |
Merge topic branch 'cg2900' 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 97d412d9145..9d25de80239 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -38,6 +38,8 @@ source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/echo/Kconfig" +source "drivers/staging/cg2900/Kconfig" + source "drivers/staging/comedi/Kconfig" source "drivers/staging/olpc_dcon/Kconfig" |