[alsa-cvslog] CVS: alsa-kernel/include core.h,1.51,1.52
Brought to you by:
perex
From: Jaroslav K. <pe...@us...> - 2004-05-30 11:50:25
|
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13012 Modified Files: core.h Log Message: Fixed warnings for pci PM callbacks when not CONFIG_PCI Index: core.h =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/include/core.h,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- core.h 3 May 2004 17:36:07 -0000 1.51 +++ core.h 30 May 2004 11:50:15 -0000 1.52 @@ -211,12 +211,14 @@ void *private_data); #define snd_card_set_isa_pm_callback(card,suspend,resume,data) \ snd_card_set_dev_pm_callback(card, PM_ISA_DEV, suspend, resume, data) +#ifdef CONFIG_PCI #ifndef SND_PCI_PM_CALLBACKS int snd_card_pci_suspend(struct pci_dev *dev, u32 state); int snd_card_pci_resume(struct pci_dev *dev); #define SND_PCI_PM_CALLBACKS \ .suspend = snd_card_pci_suspend, .resume = snd_card_pci_resume #endif +#endif #else #define snd_power_lock(card) do { (void)(card); } while (0) #define snd_power_unlock(card) do { (void)(card); } while (0) @@ -226,8 +228,10 @@ #define snd_card_set_pm_callback(card,suspend,resume,data) -EINVAL #define snd_card_set_dev_pm_callback(card,suspend,resume,data) -EINVAL #define snd_card_set_isa_pm_callback(card,suspend,resume,data) -EINVAL +#ifdef CONFIG_PCI #define SND_PCI_PM_CALLBACKS #endif +#endif /* device.c */ |