diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:23:35 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:23:35 +0100 |
| commit | 15dd570f8f94b08313e2af217b4c9d6a908b907c (patch) | |
| tree | 2a4e0c5f1b3f20fc8462128d0f8f0f52cf4a479b /drivers/video | |
| parent | a541bf2c931ed9fe077b93746895249c48fe948a (diff) | |
| parent | c2e8837f5703408b91584eec522f1e5a0bebd877 (diff) | |
Merge topic branch 'mali-generic' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index fe960f49b8a..a9a2c30b6aa 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -23,6 +23,8 @@ source "drivers/gpu/drm/Kconfig" source "drivers/gpu/stub/Kconfig" +source "drivers/gpu/mali/Kconfig" + config VGASTATE tristate default n |