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: ide: drivers/ide/generic.c -> drivers/ide/ide-pci-generic.c ide-disk: set non-rotational queue flag for SSD and CF devices ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list ide: Add tx4938ide driver (v2) TXx9: Add TX4938 ATA support (v3) ide: Add tx4939ide driver (v6) ide: two more pci_ioremap_bar() conversions pci: use pci_ioremap_bar() in drivers/ide sgiioc4: use ide_host_add() (take 2) sgiioc4: fix error cleanup path (take 2)
Showing
- arch/mips/include/asm/txx9/tx4938.h 13 additions, 0 deletionsarch/mips/include/asm/txx9/tx4938.h
- arch/mips/txx9/generic/setup_tx4938.c 47 additions, 0 deletionsarch/mips/txx9/generic/setup_tx4938.c
- arch/mips/txx9/rbtx4938/setup.c 1 addition, 0 deletionsarch/mips/txx9/rbtx4938/setup.c
- drivers/ide/Kconfig 10 additions, 0 deletionsdrivers/ide/Kconfig
- drivers/ide/Makefile 3 additions, 1 deletiondrivers/ide/Makefile
- drivers/ide/ide-cd.c 1 addition, 0 deletionsdrivers/ide/ide-cd.c
- drivers/ide/ide-disk.c 6 additions, 2 deletionsdrivers/ide/ide-disk.c
- drivers/ide/ide-pci-generic.c 0 additions, 0 deletionsdrivers/ide/ide-pci-generic.c
- drivers/ide/scc_pata.c 4 additions, 6 deletionsdrivers/ide/scc_pata.c
- drivers/ide/sgiioc4.c 7 additions, 17 deletionsdrivers/ide/sgiioc4.c
- drivers/ide/siimage.c 1 addition, 1 deletiondrivers/ide/siimage.c
- drivers/ide/tx4938ide.c 310 additions, 0 deletionsdrivers/ide/tx4938ide.c
- drivers/ide/tx4939ide.c 754 additions, 0 deletionsdrivers/ide/tx4939ide.c
Loading
Please register or sign in to comment