diff options
Diffstat (limited to 'drivers/ide/pci/sl82c105.c')
-rw-r--r-- | drivers/ide/pci/sl82c105.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 73905bcc08fb..37a6b7bdc040 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/hdreg.h> | ||
21 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
22 | #include <linux/ide.h> | 21 | #include <linux/ide.h> |
23 | 22 | ||
@@ -62,7 +61,7 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio) | |||
62 | if (cmd_off == 0) | 61 | if (cmd_off == 0) |
63 | cmd_off = 1; | 62 | cmd_off = 1; |
64 | 63 | ||
65 | if (pio > 2 || ide_dev_has_iordy(drive->id)) | 64 | if (pio > 2 || ata_id_has_iordy(drive->id)) |
66 | iordy = 0x40; | 65 | iordy = 0x40; |
67 | 66 | ||
68 | return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy; | 67 | return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy; |
@@ -272,7 +271,7 @@ static u8 sl82c105_bridge_revision(struct pci_dev *dev) | |||
272 | * channel 0 here at least, but channel 1 has to be enabled by | 271 | * channel 0 here at least, but channel 1 has to be enabled by |
273 | * firmware or arch code. We still set both to 16 bits mode. | 272 | * firmware or arch code. We still set both to 16 bits mode. |
274 | */ | 273 | */ |
275 | static unsigned int __devinit init_chipset_sl82c105(struct pci_dev *dev) | 274 | static unsigned int init_chipset_sl82c105(struct pci_dev *dev) |
276 | { | 275 | { |
277 | u32 val; | 276 | u32 val; |
278 | 277 | ||
@@ -351,6 +350,8 @@ static struct pci_driver driver = { | |||
351 | .id_table = sl82c105_pci_tbl, | 350 | .id_table = sl82c105_pci_tbl, |
352 | .probe = sl82c105_init_one, | 351 | .probe = sl82c105_init_one, |
353 | .remove = ide_pci_remove, | 352 | .remove = ide_pci_remove, |
353 | .suspend = ide_pci_suspend, | ||
354 | .resume = ide_pci_resume, | ||
354 | }; | 355 | }; |
355 | 356 | ||
356 | static int __init sl82c105_ide_init(void) | 357 | static int __init sl82c105_ide_init(void) |