Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[sfrench/cifs-2.6.git] / arch / sh / include / asm / parport.h
1 #include <asm-generic/parport.h>