Merge by hand (conflicts in sd.c)
[linux-2.6] / include / asm-m32r / hdreg.h
1 #include <asm-generic/hdreg.h>