Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[mv-sheeva.git] / include / asm-xtensa / ide.h

diff --git a/include/asm-xtensa/ide.h b/include/asm-xtensa/ide.h
index b523cd4a486ec155f347fa2a6738b4a739a3fb61..6b912742a42d34b085596131bc37b1441faa308c 100644 (file)
--- a/include/asm-xtensa/ide.h
+++ b/include/asm-xtensa/ide.h
@@ -14,7 +14,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #ifndef MAX_HWIFS
 # define MAX_HWIFS     1