diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-05 22:58:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-05 22:58:05 -0500 |
commit | a29961b33b089cf4d252ac125891a2784d20ef2f (patch) | |
tree | 8fcaa56db74d1357b73ddebb33fadba410ed1439 /include | |
parent | 731a0609df9cef35ae861d31004f50a02ebde6c2 (diff) | |
parent | b79caa68c0d48477453a90d12be34b47cb75f3a8 (diff) |
Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ssb/ssb.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h index e18f5c23b930..9d5da8b2ccf9 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h | |||
@@ -373,6 +373,15 @@ void ssb_pcihost_set_power_state(struct ssb_device *sdev, pci_power_t state) | |||
373 | if (sdev->bus->bustype == SSB_BUSTYPE_PCI) | 373 | if (sdev->bus->bustype == SSB_BUSTYPE_PCI) |
374 | pci_set_power_state(sdev->bus->host_pci, state); | 374 | pci_set_power_state(sdev->bus->host_pci, state); |
375 | } | 375 | } |
376 | #else | ||
377 | static inline void ssb_pcihost_unregister(struct pci_driver *driver) | ||
378 | { | ||
379 | } | ||
380 | |||
381 | static inline | ||
382 | void ssb_pcihost_set_power_state(struct ssb_device *sdev, pci_power_t state) | ||
383 | { | ||
384 | } | ||
376 | #endif /* CONFIG_SSB_PCIHOST */ | 385 | #endif /* CONFIG_SSB_PCIHOST */ |
377 | 386 | ||
378 | 387 | ||