Backout change to isapnp.h in 2.3.40

Thomas Sailer sailer en ife.ee.ethz.ch
Lun Ene 24 22:51:50 CST 2000


The change the attached diff backs out was made
in 2.3.40. It breaks compile (link) for eg. the situation
where you have isapnp as a module and eg. ne2k as built in.

With the change backed out, built in ne2k just doesn't
do isapnp probe and all is well.

Tom
------------ próxima parte ------------
--- include/linux/isapnp.h.orig	Sat Jan 22 00:26:45 2000
+++ include/linux/isapnp.h	Sat Jan 22 00:27:08 2000
@@ -128,7 +128,7 @@
 	struct isapnp_resources *next;	/* next resource */
 };
 
-#if defined(CONFIG_ISAPNP) || defined(CONFIG_ISAPNP_MODULE)
+#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
 
 #define __ISAPNP__
 


Más información sobre la lista de distribución Ayuda