]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cf2f768) | patch
[PATCH] libata-dev: Fix merge problem with upstream
authorAlbert Lee <albertcc@tw.ibm.com>
Sat, 25 Mar 2006 09:39:34 +0000 (17:39 +0800)
committerJeff Garzik <jeff@garzik.org>
Wed, 29 Mar 2006 22:21:53 +0000 (17:21 -0500)
commit13ee4628ce68d1e54df01cc31239c8887c59e65d
tree7d77a0b9e45b437c112d66d4968d5ae24a77e3cftree | snapshot
parentcf2f7689f94ee02e52d5331bc1a87421a67a882ccommit | diff
[PATCH] libata-dev: Fix merge problem with upstream

Fix merge problem with upstream.
Changes:
1. add missing dev->cdb_len = 16 for ATA devices
2. use ata_pio_task instead of atapi_packet_task

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/scsi/libata-core.c diff | blob | history
Linux 2.6 source tree