diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /sound/oss/cs46xxpm-24.h | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'sound/oss/cs46xxpm-24.h')
| -rw-r--r-- | sound/oss/cs46xxpm-24.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/oss/cs46xxpm-24.h b/sound/oss/cs46xxpm-24.h index e220bd7240f1..ad82db84d013 100644 --- a/sound/oss/cs46xxpm-24.h +++ b/sound/oss/cs46xxpm-24.h | |||
| @@ -38,13 +38,9 @@ | |||
| 38 | */ | 38 | */ |
| 39 | static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state); | 39 | static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state); |
| 40 | static int cs46xx_resume_tbl(struct pci_dev *pcidev); | 40 | static int cs46xx_resume_tbl(struct pci_dev *pcidev); |
| 41 | #define cs_pm_register(a, b, c) NULL | ||
| 42 | #define cs_pm_unregister_all(a) | ||
| 43 | #define CS46XX_SUSPEND_TBL cs46xx_suspend_tbl | 41 | #define CS46XX_SUSPEND_TBL cs46xx_suspend_tbl |
| 44 | #define CS46XX_RESUME_TBL cs46xx_resume_tbl | 42 | #define CS46XX_RESUME_TBL cs46xx_resume_tbl |
| 45 | #else | 43 | #else |
| 46 | #define cs_pm_register(a, b, c) pm_register((a), (b), (c)); | ||
| 47 | #define cs_pm_unregister_all(a) pm_unregister_all((a)); | ||
| 48 | #define CS46XX_SUSPEND_TBL cs46xx_null | 44 | #define CS46XX_SUSPEND_TBL cs46xx_null |
| 49 | #define CS46XX_RESUME_TBL cs46xx_null | 45 | #define CS46XX_RESUME_TBL cs46xx_null |
| 50 | #endif | 46 | #endif |