diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-06-16 13:49:22 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-06-16 13:49:22 +0100 |
| commit | 1866f48b9f1337693acdba76916aa27e4acd6acf (patch) | |
| tree | 11165b2ad7b8654292ffadcae9616500dcbd7774 /lib/Kconfig | |
| parent | c7c76a7898c8f7484c8493796299a400171ecff0 (diff) | |
| parent | 266df09df6ab7cc29cc252989d38c27e3380bc02 (diff) | |
Merge branch 'lsk-3.10-armlt-mali' into integration-lsk-3.10-juno-androidlsk-3.10-armlt-juno-20140616
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index fe01d418b09a..c69fd93521bb 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -408,3 +408,5 @@ config UCS2_STRING tristate endmenu + +source "drivers/base/kds/Kconfig" |