Re: CVS does not compile

[Takashi Iwai <tiwai@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

At Tue, 15 Feb 2005 18:41:33 -0500,
Lee Revell wrote:
> 
> On Tue, 2005-02-15 at 16:02 -0500, Lee Revell wrote:
> > from /smb/rlrevell/cvs/alsa-default-2/alsa-driver/acore/hwdep.c:28:
> > include/linux/pm.h:198: error: redefinition of `pm_message_t'
> > /smb/rlrevell/cvs/alsa-default-2/alsa-driver/include/adriver.h:717:
> > error: `pm_message_t' previously declared here
> 
> If I back out this patch it works fine.

Try the attached patch.


Takashi

[-- Attachment #2: Type: text/plain, Size: 717 bytes --]

Index: alsa-driver/include/adriver.h
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.98
diff -u -r1.98 adriver.h
--- alsa-driver/include/adriver.h	14 Feb 2005 13:54:47 -0000	1.98
+++ alsa-driver/include/adriver.h	16 Feb 2005 10:35:16 -0000
@@ -712,12 +712,14 @@
 #endif
 
 /* pm_message_t type */
-/* #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11)
+#include <linux/pm.h>
 #ifndef PMSG_FREEZE
 typedef u32 /*__bitwise*/ pm_message_t;
 #define PMSG_FREEZE	3
 #define PMSG_SUSPEND	3
 #define PMSG_ON		0
 #endif
+#endif
 
 #endif /* __SOUND_LOCAL_DRIVER_H */