diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:31 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:31 +0800 |
| commit | 5347127d7d2ccffdd5dc6af8a24010199ef86f46 (patch) | |
| tree | 3ee0ee11e14308b3d71fa4c86c6fed2509bcfc3f /drivers/video/Kconfig | |
| parent | 1cd04b2aba9f3b3468adf0789030240e032d8d3e (diff) | |
| parent | 5bd3314357fc6ec991071e0bb2f959fb98bc881c (diff) | |
Merge topic branch 'mali-generic' into integration-linux-ux500
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 93a7c86171e..c775ac2419d 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 |