diff options
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 432eb98f7fe7..2c5d83ddaef6 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
19 | #include <linux/completion.h> | 19 | #include <linux/completion.h> |
20 | #include <linux/pm.h> | ||
20 | #ifdef CONFIG_BLK_DEV_IDEACPI | 21 | #ifdef CONFIG_BLK_DEV_IDEACPI |
21 | #include <acpi/acpi.h> | 22 | #include <acpi/acpi.h> |
22 | #endif | 23 | #endif |
@@ -639,6 +640,7 @@ struct ide_host { | |||
639 | ide_hwif_t *ports[MAX_HWIFS]; | 640 | ide_hwif_t *ports[MAX_HWIFS]; |
640 | unsigned int n_ports; | 641 | unsigned int n_ports; |
641 | struct device *dev[2]; | 642 | struct device *dev[2]; |
643 | unsigned int (*init_chipset)(struct pci_dev *); | ||
642 | unsigned long host_flags; | 644 | unsigned long host_flags; |
643 | void *host_priv; | 645 | void *host_priv; |
644 | }; | 646 | }; |
@@ -1264,6 +1266,14 @@ int ide_pci_init_two(struct pci_dev *, struct pci_dev *, | |||
1264 | const struct ide_port_info *, void *); | 1266 | const struct ide_port_info *, void *); |
1265 | void ide_pci_remove(struct pci_dev *); | 1267 | void ide_pci_remove(struct pci_dev *); |
1266 | 1268 | ||
1269 | #ifdef CONFIG_PM | ||
1270 | int ide_pci_suspend(struct pci_dev *, pm_message_t); | ||
1271 | int ide_pci_resume(struct pci_dev *); | ||
1272 | #else | ||
1273 | #define ide_pci_suspend NULL | ||
1274 | #define ide_pci_resume NULL | ||
1275 | #endif | ||
1276 | |||
1267 | void ide_map_sg(ide_drive_t *, struct request *); | 1277 | void ide_map_sg(ide_drive_t *, struct request *); |
1268 | void ide_init_sg_cmd(ide_drive_t *, struct request *); | 1278 | void ide_init_sg_cmd(ide_drive_t *, struct request *); |
1269 | 1279 | ||