diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:28 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:28 +0200 |
| commit | a14bad32f8e7be121db40d883b9cdedfdf99a62d (patch) | |
| tree | 8d110be667a8e8062ec80ee290479021c219ee5f /drivers/staging/Kconfig | |
| parent | fef3d2453378a4bbd73c72d4764ea1334c24cb18 (diff) | |
| parent | 10b980fd6c94e761ce5e00b0c4fceacc03c7f629 (diff) | |
Merge topic branch 'cg2900' 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 9e634724978..7026df85dac 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" |