Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[~andy/linux] / include / asm-i386 / string.h

diff --git a/include/asm-i386/string.h b/include/asm-i386/string.h
index bb5f88a27f7a8e23711afa0aa8ca5f30d1ed95c7..b9277361954b795ed539fe013385240cd8c26eca 100644 (file)
--- a/include/asm-i386/string.h
+++ b/include/asm-i386/string.h
@@ -2,7 +2,6 @@
 #define _I386_STRING_H_
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 /*
  * On a 486 or Pentium, we are better off not using the
  * byte string operations. But on a 386 or a PPro the