From 58b45b7fee20b3d93c433ee9ed808f0858a4d568 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 18 Apr 2013 11:47:40 +1000 Subject: [PATCH] --- yaml --- r: 371437 b: refs/heads/master c: e1adc78caf440d3f6be81a947c2b913e73514a68 h: refs/heads/master i: 371435: aa11d422a80678a03888e8e5845de7d3e38fa0d4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/qxl/qxl_ttm.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 }