From b20361563d90d6b1d323e060116d5f4431e4613c Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Sun, 28 Apr 2013 14:09:25 -0700
Subject: [PATCH] --- yaml --- r: 371631 b: refs/heads/master c:
 caaa0352c41f0e21b48b902894ae8e585435587d h: refs/heads/master i:   371629:
 85cd08696f08b0aeccf7ff938d0d4daeac9923fc   371627:
 fc402b01849a55ae7ebe0281e743319b6350e1bd   371623:
 7e5d24fdcfea6cb2941362d9eccf6e19e1fd3329   371615:
 87644be3bfc79a4918f69eb79e44541d2d043de2 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/qxl/qxl_debugfs.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 770555924ed6..6145a2d3655e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e9c40382fb820c3f002928ccc7d9fdbf33ef975
+refs/heads/master: caaa0352c41f0e21b48b902894ae8e585435587d
diff --git a/trunk/drivers/gpu/drm/qxl/qxl_debugfs.c b/trunk/drivers/gpu/drm/qxl/qxl_debugfs.c
index c630152f2d2f..c3c2bbdc6674 100644
--- a/trunk/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/trunk/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -35,6 +35,7 @@
 #include "qxl_object.h"
 
 
+#if defined(CONFIG_DEBUG_FS)
 static int
 qxl_debugfs_irq_received(struct seq_file *m, void *data)
 {
@@ -69,20 +70,25 @@ static struct drm_info_list qxl_debugfs_list[] = {
 	{ "qxl_buffers", qxl_debugfs_buffers_info, 0, NULL },
 };
 #define QXL_DEBUGFS_ENTRIES ARRAY_SIZE(qxl_debugfs_list)
+#endif
 
 int
 qxl_debugfs_init(struct drm_minor *minor)
 {
+#if defined(CONFIG_DEBUG_FS)
 	drm_debugfs_create_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,
 				 minor->debugfs_root, minor);
+#endif
 	return 0;
 }
 
 void
 qxl_debugfs_takedown(struct drm_minor *minor)
 {
+#if defined(CONFIG_DEBUG_FS)
 	drm_debugfs_remove_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,
 				 minor);
+#endif
 }
 
 int qxl_debugfs_add_files(struct qxl_device *qdev,