---

yaml --- r: 293915 b: refs/heads/master c: f3c93cb h: refs/heads/master i: 293913: 9002eb4 293911: 697c8ca v: v3
git-mirror · Mar 22, 2012 · 7f90fea · 7f90fea
1 parent 05d91b9
commit 7f90fea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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"