Backout change to isapnp.h in 2.3.40

From: Thomas Sailer (sailer@ife.ee.ethz.ch)
Date: Mon Jan 24 2000 - 14:29:25 EST


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

--- 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__
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Jan 31 2000 - 21:00:13 EST