From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: CVS does not compile
Date: Wed, 16 Feb 2005 11:36:06 +0100
Message-ID: <s5hmzu4bxm1.wl@alsa2.suse.de>
References: <1108501339.3772.5.camel@krustophenia.net>
	<1108510893.3772.9.camel@krustophenia.net>
Mime-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen")
Content-Type: multipart/mixed;
 boundary="Multipart_Wed_Feb_16_11:36:06_2005-1"
In-Reply-To: <1108510893.3772.9.camel@krustophenia.net>
Sender: alsa-devel-admin@lists.sourceforge.net
Errors-To: alsa-devel-admin@lists.sourceforge.net
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Post: <mailto:alsa-devel@lists.sourceforge.net>
List-Help: <mailto:alsa-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@lists.sourceforge.net?subject=subscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum=alsa-devel>
To: Lee Revell <rlrevell@joe-job.com>
Cc: alsa-devel <alsa-devel@lists.sourceforge.net>
List-Id: alsa-devel@alsa-project.org

--Multipart_Wed_Feb_16_11:36:06_2005-1
Content-Type: text/plain; charset=US-ASCII

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

--Multipart_Wed_Feb_16_11:36:06_2005-1
Content-Type: text/plain; charset=US-ASCII

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 */

--Multipart_Wed_Feb_16_11:36:06_2005-1--


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click