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: Use menuconfig objects: IDE sl82c105: Switch to ref counting API ide: remove ide_use_dma() ide: add missing validity checks for identify words 62 and 63 ide: remove ide_dma_enable() sl82c105: add speedproc() method and MWDMA0/1 support cs5530/sc1200: add ->speedproc support cs5530/sc1200: DMA support cleanup ide: use ide_tune_dma() part #2 cs5530/sc1200: add ->udma_filter methods ide: always disable DMA before tuning it pdc202xx_new: use ide_tune_dma() alim15x3: use ide_tune_dma() sis5513: PIO mode setup fixes serverworks: PIO mode setup fixes pdc202xx_old: rewrite mode programming code (v2)
Showing
- drivers/ide/Kconfig 4 additions, 11 deletionsdrivers/ide/Kconfig
- drivers/ide/cris/ide-cris.c 1 addition, 13 deletionsdrivers/ide/cris/ide-cris.c
- drivers/ide/ide-dma.c 12 additions, 41 deletionsdrivers/ide/ide-dma.c
- drivers/ide/ide-io.c 1 addition, 0 deletionsdrivers/ide/ide-io.c
- drivers/ide/ide-lib.c 0 additions, 12 deletionsdrivers/ide/ide-lib.c
- drivers/ide/ide.c 1 addition, 0 deletionsdrivers/ide/ide.c
- drivers/ide/pci/alim15x3.c 7 additions, 62 deletionsdrivers/ide/pci/alim15x3.c
- drivers/ide/pci/cmd64x.c 1 addition, 14 deletionsdrivers/ide/pci/cmd64x.c
- drivers/ide/pci/cs5530.c 79 additions, 81 deletionsdrivers/ide/pci/cs5530.c
- drivers/ide/pci/it821x.c 1 addition, 20 deletionsdrivers/ide/pci/it821x.c
- drivers/ide/pci/pdc202xx_new.c 1 addition, 28 deletionsdrivers/ide/pci/pdc202xx_new.c
- drivers/ide/pci/pdc202xx_old.c 41 additions, 143 deletionsdrivers/ide/pci/pdc202xx_old.c
- drivers/ide/pci/sc1200.c 77 additions, 84 deletionsdrivers/ide/pci/sc1200.c
- drivers/ide/pci/scc_pata.c 1 addition, 21 deletionsdrivers/ide/pci/scc_pata.c
- drivers/ide/pci/serverworks.c 14 additions, 63 deletionsdrivers/ide/pci/serverworks.c
- drivers/ide/pci/siimage.c 1 addition, 23 deletionsdrivers/ide/pci/siimage.c
- drivers/ide/pci/sis5513.c 36 additions, 49 deletionsdrivers/ide/pci/sis5513.c
- drivers/ide/pci/sl82c105.c 62 additions, 14 deletionsdrivers/ide/pci/sl82c105.c
- include/linux/ide.h 0 additions, 3 deletionsinclude/linux/ide.h
Loading
Please register or sign in to comment