Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: use correct IDE error recovery
pdc202xx_new: Enable ATAPI DMA
ide: cosmetic adaption of drivers/ide/Kconfig concerning SATA
ide: fix locking for manual DMA enable/disable ("hdparm -d")
ide: revert "ide: fix drive side 80c cable check, take 2" for now
No related branches found
No related tags found
Showing
- drivers/ide/Kconfig 4 additions, 2 deletionsdrivers/ide/Kconfig
- drivers/ide/ide-io.c 21 additions, 11 deletionsdrivers/ide/ide-io.c
- drivers/ide/ide-iops.c 9 additions, 2 deletionsdrivers/ide/ide-iops.c
- drivers/ide/ide.c 30 additions, 7 deletionsdrivers/ide/ide.c
- drivers/ide/pci/pdc202xx_new.c 2 additions, 1 deletiondrivers/ide/pci/pdc202xx_new.c
- include/linux/ide.h 1 addition, 0 deletionsinclude/linux/ide.h
Loading
Please register or sign in to comment