x86: merge include/asm-x86/dma.h