Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

[linux-2.6-omap-h63xx.git] / arch / i386 / boot / video.S

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 8c2a6faeeae51b128e27b43e4669a7ac75dcf792..2c5b5cc55f795339a30036691d0f0d45b6a48e1a 100644 (file)
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -11,8 +11,6 @@
  *
  */
 
-#include <linux/config.h> /* for CONFIG_VIDEO_* */
-
 /* Enable autodetection of SVGA adapters and modes. */
 #undef CONFIG_VIDEO_SVGA