diff options
-rw-r--r-- | drivers/ide/cy82c693.c | 1 | ||||
-rw-r--r-- | drivers/ide/ide-proc.c | 1 | ||||
-rw-r--r-- | include/linux/ide.h | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c index 5297f07d2933..d37baf8ecc5f 100644 --- a/drivers/ide/cy82c693.c +++ b/drivers/ide/cy82c693.c | |||
@@ -292,7 +292,6 @@ static const struct ide_port_info cy82c693_chipset __devinitdata = { | |||
292 | .name = DRV_NAME, | 292 | .name = DRV_NAME, |
293 | .init_iops = init_iops_cy82c693, | 293 | .init_iops = init_iops_cy82c693, |
294 | .port_ops = &cy82c693_port_ops, | 294 | .port_ops = &cy82c693_port_ops, |
295 | .chipset = ide_cy82c693, | ||
296 | .host_flags = IDE_HFLAG_SINGLE, | 295 | .host_flags = IDE_HFLAG_SINGLE, |
297 | .pio_mask = ATA_PIO4, | 296 | .pio_mask = ATA_PIO4, |
298 | .swdma_mask = ATA_SWDMA2, | 297 | .swdma_mask = ATA_SWDMA2, |
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 066d2317545b..a14e2938e4f3 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
@@ -46,7 +46,6 @@ static int proc_ide_read_imodel | |||
46 | case ide_qd65xx: name = "qd65xx"; break; | 46 | case ide_qd65xx: name = "qd65xx"; break; |
47 | case ide_umc8672: name = "umc8672"; break; | 47 | case ide_umc8672: name = "umc8672"; break; |
48 | case ide_ht6560b: name = "ht6560b"; break; | 48 | case ide_ht6560b: name = "ht6560b"; break; |
49 | case ide_cy82c693: name = "cy82c693"; break; | ||
50 | case ide_4drives: name = "4drives"; break; | 49 | case ide_4drives: name = "4drives"; break; |
51 | case ide_pmac: name = "mac-io"; break; | 50 | case ide_pmac: name = "mac-io"; break; |
52 | case ide_au1xxx: name = "au1xxx"; break; | 51 | case ide_au1xxx: name = "au1xxx"; break; |
diff --git a/include/linux/ide.h b/include/linux/ide.h index f62d35a5fb71..f89d6d69a386 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -170,8 +170,7 @@ typedef int (ide_ack_intr_t)(struct hwif_s *); | |||
170 | enum { ide_unknown, ide_generic, ide_pci, | 170 | enum { ide_unknown, ide_generic, ide_pci, |
171 | ide_cmd640, ide_dtc2278, ide_ali14xx, | 171 | ide_cmd640, ide_dtc2278, ide_ali14xx, |
172 | ide_qd65xx, ide_umc8672, ide_ht6560b, | 172 | ide_qd65xx, ide_umc8672, ide_ht6560b, |
173 | ide_cy82c693, ide_4drives, | 173 | ide_4drives, ide_pmac, ide_acorn, |
174 | ide_pmac, ide_acorn, | ||
175 | ide_au1xxx, ide_palm3710 | 174 | ide_au1xxx, ide_palm3710 |
176 | }; | 175 | }; |
177 | 176 | ||