Merge branch 'master' into upstream

[linux-2.6] / include / asm-cris / tlbflush.h

diff --git a/include/asm-cris/tlbflush.h b/include/asm-cris/tlbflush.h
index c52238005b5592539be59892b8ef61a4bf1a3380..0569612477e3eddc1df7cbd7132b5238f19a14be 100644 (file)
--- a/include/asm-cris/tlbflush.h
+++ b/include/asm-cris/tlbflush.h
@@ -1,7 +1,6 @@
 #ifndef _CRIS_TLBFLUSH_H
 #define _CRIS_TLBFLUSH_H
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <asm/processor.h>
 #include <asm/pgtable.h>