Merge branch 'x86/asm' into x86/atomic
[pandora-kernel.git] / arch / mips / include / asm / parport.h
1 #include <asm-generic/parport.h>