Merge branch 'master' into 85xx
[linux-2.6] / include / asm-cris / ide.h
1 #include <asm/arch/ide.h>