diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:26 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:26 +0200 |
| commit | 405c2b7ff83932a0272020dc4d653ac9affc8e56 (patch) | |
| tree | 1f24576b8787b2566e174ca8b2ea9f18b2be0d94 /drivers/video/Kconfig | |
| parent | 1824f16fd3633ea156a90926db7fca2606481346 (diff) | |
| parent | c2e8837f5703408b91584eec522f1e5a0bebd877 (diff) | |
Merge topic branch 'mali-generic' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/video/Kconfig')
| -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 |