diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 16:01:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 16:01:54 -0400 |
| commit | f2556896597c43cb48f04b1c16214938a6ccce9a (patch) | |
| tree | 9e068d92ecf2c41b7b0f36a9688c56fd5fe39709 /drivers/pci/pci.c | |
| parent | 7c13e6a3d15a4ebcc3f40df5f4d19665479f8ca3 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 0a3d856833fc..c9884bba22de 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -1060,7 +1060,7 @@ bool pci_pme_capable(struct pci_dev *dev, pci_power_t state) | |||
| 1060 | * The caller must verify that the device is capable of generating PME# before | 1060 | * The caller must verify that the device is capable of generating PME# before |
| 1061 | * calling this function with @enable equal to 'true'. | 1061 | * calling this function with @enable equal to 'true'. |
| 1062 | */ | 1062 | */ |
| 1063 | static void pci_pme_active(struct pci_dev *dev, bool enable) | 1063 | void pci_pme_active(struct pci_dev *dev, bool enable) |
| 1064 | { | 1064 | { |
| 1065 | u16 pmcsr; | 1065 | u16 pmcsr; |
| 1066 | 1066 | ||
| @@ -1941,6 +1941,7 @@ EXPORT_SYMBOL(pci_set_power_state); | |||
| 1941 | EXPORT_SYMBOL(pci_save_state); | 1941 | EXPORT_SYMBOL(pci_save_state); |
| 1942 | EXPORT_SYMBOL(pci_restore_state); | 1942 | EXPORT_SYMBOL(pci_restore_state); |
| 1943 | EXPORT_SYMBOL(pci_pme_capable); | 1943 | EXPORT_SYMBOL(pci_pme_capable); |
| 1944 | EXPORT_SYMBOL(pci_pme_active); | ||
| 1944 | EXPORT_SYMBOL(pci_enable_wake); | 1945 | EXPORT_SYMBOL(pci_enable_wake); |
| 1945 | EXPORT_SYMBOL(pci_target_state); | 1946 | EXPORT_SYMBOL(pci_target_state); |
| 1946 | EXPORT_SYMBOL(pci_prepare_to_sleep); | 1947 | EXPORT_SYMBOL(pci_prepare_to_sleep); |
