Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[linux-2.6] / include / asm-cris / ide.h
1 #include <asm/arch/ide.h>