Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / include / video / edid.h

diff --git a/include/video/edid.h b/include/video/edid.h
index b913f196131de19549787faf91a413963ada2a2c..f6a42d6c2e2d6e22daade1d3680cc1a088f26d26 100644 (file)
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -3,7 +3,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #ifdef CONFIG_X86
 struct edid_info {