Merge branch 'master' into for-upstream

[linux-2.6-omap-h63xx.git] / drivers / video / matrox / matroxfb_Ti3026.h

diff --git a/drivers/video/matrox/matroxfb_Ti3026.h b/drivers/video/matrox/matroxfb_Ti3026.h
index 536e5f69de9fb338f3ef6983f3c728592e2b216c..27872aaa0a17d494d5cadc73de0609093744f99f 100644 (file)
--- a/drivers/video/matrox/matroxfb_Ti3026.h
+++ b/drivers/video/matrox/matroxfb_Ti3026.h
@@ -1,7 +1,6 @@
 #ifndef __MATROXFB_TI3026_H__
 #define __MATROXFB_TI3026_H__
 
-#include <linux/config.h>
 
 #include "matroxfb_base.h"