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: via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S ide: unregister idepnp driver on unload ide: add missing __init tags to IDE PCI host drivers ia64: add pci_get_legacy_ide_irq() ide/generic: Jmicron has its own drivers now atiixp.c: add cable detection support for ATI IDE atiixp.c: sb600 ide only has one channel atiixp.c: remove unused code jmicron: fix warning ide: update MAINTAINERS entry
Showing
- MAINTAINERS 3 additions, 4 deletionsMAINTAINERS
- drivers/ata/pata_via.c 1 addition, 0 deletionsdrivers/ata/pata_via.c
- drivers/ide/ide-pnp.c 5 additions, 0 deletionsdrivers/ide/ide-pnp.c
- drivers/ide/ide.c 5 additions, 0 deletionsdrivers/ide/ide.c
- drivers/ide/pci/aec62xx.c 1 addition, 1 deletiondrivers/ide/pci/aec62xx.c
- drivers/ide/pci/alim15x3.c 1 addition, 1 deletiondrivers/ide/pci/alim15x3.c
- drivers/ide/pci/amd74xx.c 1 addition, 1 deletiondrivers/ide/pci/amd74xx.c
- drivers/ide/pci/atiixp.c 19 additions, 23 deletionsdrivers/ide/pci/atiixp.c
- drivers/ide/pci/cmd64x.c 1 addition, 1 deletiondrivers/ide/pci/cmd64x.c
- drivers/ide/pci/cs5520.c 1 addition, 1 deletiondrivers/ide/pci/cs5520.c
- drivers/ide/pci/cs5530.c 1 addition, 1 deletiondrivers/ide/pci/cs5530.c
- drivers/ide/pci/cy82c693.c 1 addition, 1 deletiondrivers/ide/pci/cy82c693.c
- drivers/ide/pci/generic.c 1 addition, 36 deletionsdrivers/ide/pci/generic.c
- drivers/ide/pci/hpt34x.c 1 addition, 1 deletiondrivers/ide/pci/hpt34x.c
- drivers/ide/pci/hpt366.c 1 addition, 1 deletiondrivers/ide/pci/hpt366.c
- drivers/ide/pci/jmicron.c 2 additions, 1 deletiondrivers/ide/pci/jmicron.c
- drivers/ide/pci/ns87415.c 1 addition, 1 deletiondrivers/ide/pci/ns87415.c
- drivers/ide/pci/opti621.c 1 addition, 1 deletiondrivers/ide/pci/opti621.c
- drivers/ide/pci/pdc202xx_new.c 1 addition, 1 deletiondrivers/ide/pci/pdc202xx_new.c
- drivers/ide/pci/pdc202xx_old.c 1 addition, 1 deletiondrivers/ide/pci/pdc202xx_old.c
Loading
Please register or sign in to comment