diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /include/linux/pci.h | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 03b0b8c3c81b..4bb156ba854a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -421,7 +421,6 @@ struct pci_driver { | |||
| 421 | int (*resume_early) (struct pci_dev *dev); | 421 | int (*resume_early) (struct pci_dev *dev); |
| 422 | int (*resume) (struct pci_dev *dev); /* Device woken up */ | 422 | int (*resume) (struct pci_dev *dev); /* Device woken up */ |
| 423 | void (*shutdown) (struct pci_dev *dev); | 423 | void (*shutdown) (struct pci_dev *dev); |
| 424 | struct pm_ext_ops *pm; | ||
| 425 | struct pci_error_handlers *err_handler; | 424 | struct pci_error_handlers *err_handler; |
| 426 | struct device_driver driver; | 425 | struct device_driver driver; |
| 427 | struct pci_dynids dynids; | 426 | struct pci_dynids dynids; |