diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:00 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:00 -0800 |
| commit | a70c0eab1897b2bb15d89f43267828682950842e (patch) | |
| tree | 3b53319c93e0a73db1d8df5947e6ed621ccbb5df /drivers/video/Kconfig | |
| parent | 83adb17804d48ead8fc91a8ab7dda81db13b9444 (diff) | |
| parent | 7f9ed524778bcdcd8a51bdeab2095655fb57c431 (diff) | |
Merge branch 'korg-android-3.1' into korg-android+linux-tegra-3.1
Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/misc/Kconfig
drivers/misc/Makefile
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
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 28ae7c089dea..97e8171020ad 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/ion/Kconfig" + config VGASTATE tristate default n |