From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: PCI_D0 and PCI_D3hot in atiixp_modem.c not defined in pci.h
Date: Wed, 13 Apr 2005 15:08:53 +0200
Message-ID: <s5his2q7riy.wl@alsa2.suse.de>
References: <92C0412E07F63549B2A2F2345D3DB51501E4B074@cm-msg-02.cmedia.com.tw>
	<s5hk6n67rpg.wl@alsa2.suse.de>
Mime-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen")
Content-Type: multipart/mixed;
 boundary="Multipart_Wed_Apr_13_15:08:53_2005-1"
Return-path: <alsa-devel-admin@lists.sourceforge.net>
Received: from mx1.suse.de (ns.suse.de [195.135.220.2])
	by alsa.alsa-project.org (ALSA's E-mail Delivery System) with ESMTP id 28D21D4
	for <alsa-devel@alsa-project.org>; Wed, 13 Apr 2005 15:08:54 +0200 (MEST)
In-Reply-To: <s5hk6n67rpg.wl@alsa2.suse.de>
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: "Tien, C.L." <cltien@cmedia.com.tw>
Cc: alsa-devel@alsa-project.org
List-Id: alsa-devel@alsa-project.org

--Multipart_Wed_Apr_13_15:08:53_2005-1
Content-Type: text/plain; charset=US-ASCII

At Wed, 13 Apr 2005 15:04:59 +0200,
I wrote:
> 
> [1  <text/plain; US-ASCII (7bit)>]
> At Wed, 13 Apr 2005 07:53:07 +0800,
> Tien, C.L. wrote:
> > 
> > Hi,
> > 
> > The CVS version of atiixp_modem.c use PCI_D0 and PCI_D3hot. These
> > constants are not defined in pci.h before kernel version 2.6.11,
> > compile the file will cause compile error as following: 
> 
> The patch below should fix this problem.

This one is safer...
I'll apply this to CVS.


Takashi

--Multipart_Wed_Apr_13_15:08:53_2005-1
Content-Type: text/plain; charset=US-ASCII

Index: alsa-driver/include/adriver.h
===================================================================
RCS file: /home/iwai/cvs/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.108
retrieving revision 1.110
diff -u -r1.108 -r1.110
--- alsa-driver/include/adriver.h	11 Apr 2005 15:54:49 -0000	1.108
+++ alsa-driver/include/adriver.h	13 Apr 2005 13:07:29 -0000	1.110
@@ -80,14 +80,6 @@
 #endif
 #endif /* LINUX_2_2 */
 
-#ifndef PCI_D0
-#define PCI_D0     0
-#define PCI_D1     1
-#define PCI_D2     2
-#define PCI_D3hot  3
-#define PCI_D3cold 4
-#endif
-
 #ifdef LINUX_2_4__donotuse
 #include <linux/init.h>
 #include <linux/pm.h>
@@ -732,6 +724,19 @@
 #endif
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11)
+#ifdef CONFIG_PCI
+#include <linux/pci.h>
+#ifndef PCI_D0
+#define PCI_D0     0
+#define PCI_D1     1
+#define PCI_D2     2
+#define PCI_D3hot  3
+#define PCI_D3cold 4
+#endif
+#endif
+#endif
+
 /* vprintk */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 9)
 #include <linux/kernel.h>

--Multipart_Wed_Apr_13_15:08:53_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