Merge branch 'master' into upstream
[linux-2.6] / include / asm-ia64 / libata-portmap.h
1 #include <asm-generic/libata-portmap.h>