diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-10-28 11:14:50 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-10-28 11:14:50 +0100 |
| commit | 4f8922aafd86c0a92aeb41484aaff07bef3f7ffe (patch) | |
| tree | 0672359055ff0d915ae75fc3e0b1ce6ef9d20f80 /drivers/video/Kconfig | |
| parent | 5354141df8257eca5c863d71704f023beeb775e9 (diff) | |
| parent | b017e4726d4c5cfa7ca4f475e2a0d903abd330b1 (diff) | |
Merge branch 'lsk-3.18-armlt-mali' into lsk-3.18-armltlsk-3.18-armlt-20161028lsk-3.18-armlt
Conflicts:
arch/arm64/boot/dts/arm/juno-base.dtsi
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 49fcbb1632af..4e9919b8e0a3 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -21,6 +21,7 @@ source "drivers/gpu/vga/Kconfig" source "drivers/gpu/host1x/Kconfig" source "drivers/gpu/ipu-v3/Kconfig" +source "drivers/gpu/arm/Kconfig" menu "Direct Rendering Manager" source "drivers/gpu/drm/Kconfig" |