From 7f90feab5542543a9bd14b2ef734860104c64aa3 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 16 Mar 2012 18:19:14 +1000 Subject: [PATCH] --- yaml --- r: 293915 b: refs/heads/master c: f3c93cbde7eab38671ae085cb1027b08f5f36757 h: refs/heads/master i: 293913: 9002eb438cfdbef647817c81a0e15a76288f07b3 293911: 697c8cabbc523dd48dd2954d5aa534be3413db4e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/Kconfig | 2 ++ trunk/drivers/staging/Kconfig | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c4a675fe2de5..f8772073982e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f887c425f9eeed8ffbca64c8be45da62b07096c0 +refs/heads/master: f3c93cbde7eab38671ae085cb1027b08f5f36757 diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig index 2418429a9836..8ea3bca22ee2 100644 --- a/trunk/drivers/gpu/drm/Kconfig +++ b/trunk/drivers/gpu/drm/Kconfig @@ -71,6 +71,8 @@ config DRM_RADEON source "drivers/gpu/drm/radeon/Kconfig" +source "drivers/gpu/drm/nouveau/Kconfig" + config DRM_I810 tristate "Intel I810" # !PREEMPT because of missing ioctl locking diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig index 21e2f4b87f14..71cb8157f47d 100644 --- a/trunk/drivers/staging/Kconfig +++ b/trunk/drivers/staging/Kconfig @@ -66,8 +66,6 @@ source "drivers/staging/phison/Kconfig" source "drivers/staging/line6/Kconfig" -source "drivers/gpu/drm/nouveau/Kconfig" - source "drivers/staging/octeon/Kconfig" source "drivers/staging/serqt_usb2/Kconfig"