Update of /cvsroot/alsa/alsa-driver/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24643/include
Modified Files:
adriver.h config.h.in
Log Message:
- fixed and clean upthe build without isapnp support.
empty *.isapnp will be made when isapnp is not supported.
Index: adriver.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- adriver.h 21 Jan 2004 18:33:32 -0000 1.67
+++ adriver.h 26 Jan 2004 11:08:48 -0000 1.68
@@ -151,20 +151,19 @@
#endif
#endif
-#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
-#include <linux/isapnp.h>
-#ifndef CONFIG_PNP
-#define CONFIG_PNP
+/* isapnp support for 2.2 kernels */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
+#undef CONFIG_ISAPNP
+#ifdef CONFIG_SND_ISAPNP
+#define CONFIG_ISAPNP
+#endif
#endif
-#if (defined(CONFIG_ISAPNP_KERNEL) && defined(ALSA_BUILD)) || (LINUX_VERSION_CODE >=
KERNEL_VERSION(2, 3, 30) && !defined(ALSA_BUILD))
-#define isapnp_dev pci_dev
-#define isapnp_card pci_bus
-#endif
-#undef __ISAPNP__
-#define __ISAPNP__
-#else
+
+/* support of pnp compatible layer for 2.2/2.4 kernels */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
#undef CONFIG_PNP
+#ifdef CONFIG_SND_PNP
+#define CONFIG_PNP
#endif
#endif
Index: config.h.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/include/config.h.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config.h.in 8 Jan 2004 13:12:53 -0000 1.26
+++ config.h.in 26 Jan 2004 11:08:48 -0000 1.27
@@ -25,8 +25,8 @@
#undef CONFIG_SND_KERNELDIR
#undef CONFIG_ISAPNP_KERNEL
#undef CONFIG_PNP_KERNEL
-#undef CONFIG_ISAPNP
-#undef CONFIG_PNP
+#undef CONFIG_SND_ISAPNP
+#undef CONFIG_SND_PNP
/* 2.4 kernels */
#undef CONFIG_HAVE_OLD_REQUEST_MODULE
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
