Merge branch 'linux-2.6' into merge

[karo-tx-linux.git] / arch / h8300 / mm / memory.c

diff --git a/arch/h8300/mm/memory.c b/arch/h8300/mm/memory.c
index 81eace93f8679be6e5a26bb11e9e6d6464ecee43..ccd6ade816dd027cc86653f7050cc7d132602cd2 100644 (file)
--- a/arch/h8300/mm/memory.c
+++ b/arch/h8300/mm/memory.c
@@ -17,7 +17,6 @@
  *  Copyright (C) 1995  Hamish Macdonald
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/kernel.h>
 #include <linux/string.h>