summaryrefslogtreecommitdiff
path: root/linux-core/drm_sysfs.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-11-06 08:03:18 +1100
committerDave Airlie <airlied@linux.ie>2006-11-06 08:03:18 +1100
commit1e90b7ee8cefff59b70e285557aa7920dea77e81 (patch)
tree2132e5dcee9e5ef9693742100953063cd6423b3a /linux-core/drm_sysfs.c
parent0c34d0f31a691bb649ed69f19e93fc1a723aa1d4 (diff)
parent7b6cd95bb6c41653aed78952da0a461bd4791413 (diff)
Merge branch 'master' into nouveau-1
Conflicts: linux-core/Makefile.kernel
Diffstat (limited to 'linux-core/drm_sysfs.c')
-rw-r--r--linux-core/drm_sysfs.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux-core/drm_sysfs.c b/linux-core/drm_sysfs.c
index df75d7b0..e5dd0532 100644
--- a/linux-core/drm_sysfs.c
+++ b/linux-core/drm_sysfs.c
@@ -11,7 +11,6 @@
*
*/
-#include <linux/config.h>
#include <linux/device.h>
#include <linux/kdev_t.h>
#include <linux/err.h>