From a0c98c6b66f0c3f0ec7239589f1cd5c5688f5242 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 3 Nov 2011 18:22:48 +0000 Subject: [PATCH] --- yaml --- r: 282443 b: refs/heads/master c: 91c75492118bab5450488e7368bd79664ce2d621 h: refs/heads/master i: 282441: a0b978871b33dd01d77ffd1fec1499c13304b8c7 282439: dfbd90e75bdcf22e57b6b067e0aba7de916ab14b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/Kconfig | 3 +++ trunk/drivers/gpu/drm/Makefile | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f8ee8289afd1..6ee27db246e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af3a2cfbd132a0556f0e5e457817337047ebcb4c +refs/heads/master: 91c75492118bab5450488e7368bd79664ce2d621 diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig index 785127cb281b..45079046b6d5 100644 --- a/trunk/drivers/gpu/drm/Kconfig +++ b/trunk/drivers/gpu/drm/Kconfig @@ -162,3 +162,6 @@ config DRM_SAVAGE source "drivers/gpu/drm/exynos/Kconfig" source "drivers/gpu/drm/vmwgfx/Kconfig" + +source "drivers/gpu/drm/gma500/Kconfig" + diff --git a/trunk/drivers/gpu/drm/Makefile b/trunk/drivers/gpu/drm/Makefile index c0496f660707..6307486b1637 100644 --- a/trunk/drivers/gpu/drm/Makefile +++ b/trunk/drivers/gpu/drm/Makefile @@ -36,4 +36,5 @@ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ obj-$(CONFIG_DRM_VIA) +=via/ obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ obj-$(CONFIG_DRM_EXYNOS) +=exynos/ +obj-$(CONFIG_DRM_GMA500) += gma500/ obj-y += i2c/