diff options
-rw-r--r-- | drivers/ide/pci/siimage.c | 3 | ||||
-rw-r--r-- | include/linux/ide.h | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index ef5b39fa042b..cc4be9621bc0 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -704,9 +704,6 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif) | |||
704 | hwif->sata_scr[SATA_STATUS_OFFSET] = base + 0x104; | 704 | hwif->sata_scr[SATA_STATUS_OFFSET] = base + 0x104; |
705 | hwif->sata_scr[SATA_ERROR_OFFSET] = base + 0x108; | 705 | hwif->sata_scr[SATA_ERROR_OFFSET] = base + 0x108; |
706 | hwif->sata_scr[SATA_CONTROL_OFFSET] = base + 0x100; | 706 | hwif->sata_scr[SATA_CONTROL_OFFSET] = base + 0x100; |
707 | hwif->sata_misc[SATA_MISC_OFFSET] = base + 0x140; | ||
708 | hwif->sata_misc[SATA_PHY_OFFSET] = base + 0x144; | ||
709 | hwif->sata_misc[SATA_IEN_OFFSET] = base + 0x148; | ||
710 | } | 707 | } |
711 | 708 | ||
712 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports)); | 709 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports)); |
diff --git a/include/linux/ide.h b/include/linux/ide.h index ad75e703d14b..e02fd111a7ea 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -115,10 +115,6 @@ typedef unsigned char byte; /* used everywhere */ | |||
115 | #define SATA_ERROR_OFFSET (1) | 115 | #define SATA_ERROR_OFFSET (1) |
116 | #define SATA_CONTROL_OFFSET (2) | 116 | #define SATA_CONTROL_OFFSET (2) |
117 | 117 | ||
118 | #define SATA_MISC_OFFSET (0) | ||
119 | #define SATA_PHY_OFFSET (1) | ||
120 | #define SATA_IEN_OFFSET (2) | ||
121 | |||
122 | /* | 118 | /* |
123 | * Our Physical Region Descriptor (PRD) table should be large enough | 119 | * Our Physical Region Descriptor (PRD) table should be large enough |
124 | * to handle the biggest I/O request we are likely to see. Since requests | 120 | * to handle the biggest I/O request we are likely to see. Since requests |
@@ -473,7 +469,6 @@ typedef struct hwif_s { | |||
473 | /* task file registers for pata and sata */ | 469 | /* task file registers for pata and sata */ |
474 | unsigned long io_ports[IDE_NR_PORTS]; | 470 | unsigned long io_ports[IDE_NR_PORTS]; |
475 | unsigned long sata_scr[SATA_NR_PORTS]; | 471 | unsigned long sata_scr[SATA_NR_PORTS]; |
476 | unsigned long sata_misc[SATA_NR_PORTS]; | ||
477 | 472 | ||
478 | ide_drive_t drives[MAX_DRIVES]; /* drive info */ | 473 | ide_drive_t drives[MAX_DRIVES]; /* drive info */ |
479 | 474 | ||