diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:36 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:36 +0800 |
| commit | 591e5e125f9de0513a732371378eeffe09ef4da5 (patch) | |
| tree | d631e2313179ec61b484f1206e8f873b696ac41c /drivers/staging/Kconfig | |
| parent | 6da6382191c30868dd8bf0624f6c2439339b7760 (diff) | |
| parent | 66e68aa37bceeb4279857b48d17023530aed4dbb (diff) | |
Merge topic branch 'ste-multimedia-framework' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index ed08bf1d97f..78d03df1a59 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -136,4 +136,10 @@ source "drivers/staging/ozwpan/Kconfig" source "drivers/staging/cw1200/Kconfig" +source "drivers/staging/mmio/Kconfig" + +source "drivers/staging/nmf-cm/Kconfig" + +source "drivers/staging/camera_flash/Kconfig" + endif # STAGING |