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: (23 commits)
  ide: add support for SCSI ioctls to ide-floppy
  ide: remove stale changelog from setup-pci.c
  ide: remove stale changelog/comments/TODO from ide.c
  ide-cris: handle PIO auto-tuning in tune_cris_ide()
  ide: add PIO masks
  ide: remove ide_find_best_pio_mode()
  ide: drop "PIO data" argument from ide_get_best_pio_mode()
  ide: ide_find_best_pio_mode() fixes (take 2)
  ide: add ide_pio_cycle_time() helper (take 2)
  sc1200: remove stale Power Management code
  ide: ide_start_power_step() fix WRT disabling DMA
  serverworks: fix DMA
  serverworks: always tune PIO
  ide: add ide_pci_device_t.host_flags (take 2)
  ide: add ide_dev_has_iordy() helper (take 4)
  ide: make ide_get_best_pio_mode() print info if overriding PIO mode
  siimage: PIO mode setup fixes (take 2)
  atiixp: PIO mode setup fixes
  ide: Stop mapping ROMs
  IDE: Remove references to dead ETRAX-related variables.
  ...

1 files changed, 0 insertions, 15 deletions

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 0d51a11e81da..48caa468b762 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -95,92 +95,77 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "Unknown",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 1 */
                 .name           = "NS87410",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
                 .bootable       = ON_BOARD,
         },{     /* 2 */
                 .name           = "SAMURAI",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 3 */
                 .name           = "HT6565",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 4 */
                 .name           = "UM8673F",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NODMA,
                 .bootable       = ON_BOARD,
         },{     /* 5 */
                 .name           = "UM8886A",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NODMA,
                 .bootable       = ON_BOARD,
         },{     /* 6 */
                 .name           = "UM8886BF",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NODMA,
                 .bootable       = ON_BOARD,
         },{     /* 7 */
                 .name           = "HINT_IDE",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 8 */
                 .name           = "VIA_IDE",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 9 */
                 .name           = "OPTI621V",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 10 */
                 .name           = "VIA8237SATA",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
         },{     /* 11 */
                 .name           = "Piccolo0102",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 12 */
                 .name           = "Piccolo0103",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 13 */
                 .name           = "Piccolo0105",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 14 */
                 .name           = "Revolution",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
         }