Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[linux-2.6] / arch / m68k / sun3x / config.c

diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c
index 52fb174088698388e486514fc6a4d3093ed1f32a..987891783a472f64662ba93b2093639aebcd0960 100644 (file)
--- a/arch/m68k/sun3x/config.c
+++ b/arch/m68k/sun3x/config.c
@@ -6,7 +6,6 @@
  * based on code from Oliver Jowett <oliver@jowett.manawatu.gen.nz>
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/console.h>