Merge branch 'linus' into core/generic-dma-coherent

[safe/jmp/linux-2.6] / include / asm-cris / ide.h

diff --git a/include/asm-cris/ide.h b/include/asm-cris/ide.h
deleted file mode 100644 (file)
index a894f66..0000000
--- a/include/asm-cris/ide.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/arch/ide.h>