Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (46 commits) ide: constify struct ide_dma_ops ide: add struct ide_dma_ops (take 3) ide: add IDE_HFLAG_SERIALIZE_DMA host flag sl82c105: check bridge revision in sl82c105_init_one() au1xxx-ide: use ->init_dma method palm_bk3710: use ->init_dma method sgiioc4: use ->init_dma method icside: use ->init_dma method ide-pmac: use ->init_dma method ide: do complete DMA setup in ->init_dma method (take 2) au1xxx-ide: fix MWDMA support ide: cleanup ide_setup_dma() ide: factor out setting PCI bus-mastering from ide_hwif_setup_dma() ide: export ide_allocate_dma_engine() ide: move ide_setup_dma() call out from ->init_dma method alim15x3: skip DMA initialization completely on revs < 0x20 pdc202xx_old: remove init_dma_pdc202xx() ide: don't display "BIOS" settings in ide_setup_dma() ide: remove ->cds field from ide_hwif_t (take 2) ide: remove ide_dma_iobase() ...
Showing
- Documentation/mips/AU1xxx_IDE.README 0 additions, 46 deletionsDocumentation/mips/AU1xxx_IDE.README
- drivers/ide/arm/bast-ide.c 1 addition, 2 deletionsdrivers/ide/arm/bast-ide.c
- drivers/ide/arm/icside.c 36 additions, 20 deletionsdrivers/ide/arm/icside.c
- drivers/ide/arm/ide_arm.c 17 additions, 1 deletiondrivers/ide/arm/ide_arm.c
- drivers/ide/arm/palm_bk3710.c 20 additions, 8 deletionsdrivers/ide/arm/palm_bk3710.c
- drivers/ide/arm/rapide.c 0 additions, 1 deletiondrivers/ide/arm/rapide.c
- drivers/ide/cris/ide-cris.c 19 additions, 14 deletionsdrivers/ide/cris/ide-cris.c
- drivers/ide/h8300/ide-h8300.c 0 additions, 1 deletiondrivers/ide/h8300/ide-h8300.c
- drivers/ide/ide-acpi.c 6 additions, 6 deletionsdrivers/ide/ide-acpi.c
- drivers/ide/ide-cd.c 293 additions, 292 deletionsdrivers/ide/ide-cd.c
- drivers/ide/ide-dma.c 31 additions, 109 deletionsdrivers/ide/ide-dma.c
- drivers/ide/ide-floppy.c 3 additions, 3 deletionsdrivers/ide/ide-floppy.c
- drivers/ide/ide-generic.c 18 additions, 2 deletionsdrivers/ide/ide-generic.c
- drivers/ide/ide-io.c 7 additions, 6 deletionsdrivers/ide/ide-io.c
- drivers/ide/ide-iops.c 23 additions, 15 deletionsdrivers/ide/ide-iops.c
- drivers/ide/ide-lib.c 15 additions, 11 deletionsdrivers/ide/ide-lib.c
- drivers/ide/ide-pnp.c 26 additions, 2 deletionsdrivers/ide/ide-pnp.c
- drivers/ide/ide-probe.c 119 additions, 45 deletionsdrivers/ide/ide-probe.c
- drivers/ide/ide-proc.c 3 additions, 3 deletionsdrivers/ide/ide-proc.c
- drivers/ide/ide-scan-pci.c 1 addition, 1 deletiondrivers/ide/ide-scan-pci.c
Loading
Please register or sign in to comment