Merge commit 'v2.6.34-rc5' into oprofile/core
[pandora-kernel.git] / arch / mips / include / asm / parport.h
1 #include <asm-generic/parport.h>