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: (33 commits) amd74xx: remove /proc/ide/amd74xx amd74xx/via82cxxx: don't initialize drive->dn sis5513: remove /proc/ide/sis ide: remove CONFIG_IDEDMA_ONLYDISK ide: add "hdx=nodma" kernel parameter ide: remove hwif->autodma and drive->autodma ide: remove "idex=dma" kernel parameter ide: remove CONFIG_BLK_DEV_IDEDMA_FORCED ide: use PCI_VDEVICE() macro sis5513: clear prefetch and postwrite for ATAPI devices it8213/piix/slc90e66: "de-couple" PIO and UDMA modes ide: unexport noautodma ide: unexport ide_tune_dma ide: remove ->ide_dma_check (take 2) ide-pmac: add PIO autotune fallback to ->ide_dma_check ide-cris: add PIO autotune fallback to ->ide_dma_check sl82c105: add PIO autotune fallback to ->ide_dma_check cs5530/sc1200: add PIO autotune fallback to ->ide_dma_check ide: remove ide_use_fast_pio() ide: remove drive->init_speed zeroing ...
Showing
- Documentation/ide.txt 2 additions, 4 deletionsDocumentation/ide.txt
- drivers/ide/Kconfig 0 additions, 18 deletionsdrivers/ide/Kconfig
- drivers/ide/arm/icside.c 0 additions, 17 deletionsdrivers/ide/arm/icside.c
- drivers/ide/cris/ide-cris.c 2 additions, 13 deletionsdrivers/ide/cris/ide-cris.c
- drivers/ide/ide-dma.c 45 additions, 32 deletionsdrivers/ide/ide-dma.c
- drivers/ide/ide-io.c 2 additions, 2 deletionsdrivers/ide/ide-io.c
- drivers/ide/ide-iops.c 2 additions, 2 deletionsdrivers/ide/ide-iops.c
- drivers/ide/ide-lib.c 0 additions, 15 deletionsdrivers/ide/ide-lib.c
- drivers/ide/ide-probe.c 2 additions, 14 deletionsdrivers/ide/ide-probe.c
- drivers/ide/ide.c 8 additions, 11 deletionsdrivers/ide/ide.c
- drivers/ide/legacy/ide-cs.c 7 additions, 5 deletionsdrivers/ide/legacy/ide-cs.c
- drivers/ide/mips/au1xxx-ide.c 15 additions, 23 deletionsdrivers/ide/mips/au1xxx-ide.c
- drivers/ide/pci/aec62xx.c 10 additions, 26 deletionsdrivers/ide/pci/aec62xx.c
- drivers/ide/pci/alim15x3.c 3 additions, 31 deletionsdrivers/ide/pci/alim15x3.c
- drivers/ide/pci/amd74xx.c 25 additions, 172 deletionsdrivers/ide/pci/amd74xx.c
- drivers/ide/pci/atiixp.c 11 additions, 82 deletionsdrivers/ide/pci/atiixp.c
- drivers/ide/pci/cmd64x.c 5 additions, 22 deletionsdrivers/ide/pci/cmd64x.c
- drivers/ide/pci/cs5520.c 5 additions, 20 deletionsdrivers/ide/pci/cs5520.c
- drivers/ide/pci/cs5530.c 8 additions, 37 deletionsdrivers/ide/pci/cs5530.c
- drivers/ide/pci/cs5535.c 2 additions, 26 deletionsdrivers/ide/pci/cs5535.c
Loading
Please register or sign in to comment