[libata reset-seq] build and merge fixes

Signed-off-by: Jeff Garzik <jeff@garzik.org>
3 files changed