git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
oss
/
cs46xxpm-24.h
diff --git
a/sound/oss/cs46xxpm-24.h
b/sound/oss/cs46xxpm-24.h
index
9774add
..
ad82db8
100644
(file)
--- a/
sound/oss/cs46xxpm-24.h
+++ b/
sound/oss/cs46xxpm-24.h
@@
-36,18
+36,13
@@
* for now (12/22/00) only enable the pm_register PM support.
* allow these table entries to be null.
*/
* for now (12/22/00) only enable the pm_register PM support.
* allow these table entries to be null.
*/
-static int cs46xx_suspend_tbl(struct pci_dev *pcidev,
u32
state);
+static int cs46xx_suspend_tbl(struct pci_dev *pcidev,
pm_message_t
state);
static int cs46xx_resume_tbl(struct pci_dev *pcidev);
static int cs46xx_resume_tbl(struct pci_dev *pcidev);
-#define cs_pm_register(a, b, c) 0
-#define cs_pm_unregister_all(a)
#define CS46XX_SUSPEND_TBL cs46xx_suspend_tbl
#define CS46XX_RESUME_TBL cs46xx_resume_tbl
#else
#define CS46XX_SUSPEND_TBL cs46xx_suspend_tbl
#define CS46XX_RESUME_TBL cs46xx_resume_tbl
#else
-#define cs_pm_register(a, b, c) pm_register((a), (b), (c));
-#define cs_pm_unregister_all(a) pm_unregister_all((a));
#define CS46XX_SUSPEND_TBL cs46xx_null
#define CS46XX_RESUME_TBL cs46xx_null
#endif
#define CS46XX_SUSPEND_TBL cs46xx_null
#define CS46XX_RESUME_TBL cs46xx_null
#endif
-int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data);
#endif
#endif