diff --git a/[refs] b/[refs]
index bcc91de16872..abee09b173d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f7bc6acf78af238a0b8ee0bb86ab62f1fc4f51f
+refs/heads/master: e1adc78caf440d3f6be81a947c2b913e73514a68
diff --git a/trunk/drivers/gpu/drm/qxl/qxl_ttm.c b/trunk/drivers/gpu/drm/qxl/qxl_ttm.c
index 1a86242eedb0..489cb8cece4d 100644
--- a/trunk/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/trunk/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -555,6 +555,7 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
 
 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
 {
+#if defined(CONFIG_DEBUG_FS)
 	static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
 	static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
 	unsigned i;
@@ -574,4 +575,7 @@ static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
 
 	}
 	return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
+#else
+	return 0;
+#endif
 }