[path] 2.2.0pre1 compilation fix #1

Arjan van de Ven (arjan@fenrus.demon.nl)
Tue, 29 Dec 1998 10:06:09 +0100 (CET)


Hi Linus,

Please consider the following 2 patches for inclusion in 2.2.0.
The first one makes the dependency for the BAYCOM-parport-drivers on
CONFIG_PARPORT (which can be a module) explicit, the second one
fixes a minor bug in wanmain.c where "fullname" was #ifdef'd for module
but used in a "#ifndef MODULE" section.

Greetings,
Arjan van de Ven

diff -u -r linux/drivers/net/hamradio/Config.in /usr/src/linux/drivers/net/hamradio/Config.in
--- linux/drivers/net/hamradio/Config.in Sun Jun 7 20:13:45 1998
+++ /usr/src/linux/drivers/net/hamradio/Config.in Tue Dec 29 10:49:04 1998
@@ -13,8 +13,8 @@

tristate 'BAYCOM ser12 fullduplex driver for AX.25' CONFIG_BAYCOM_SER_FDX
tristate 'BAYCOM ser12 halfduplex driver for AX.25' CONFIG_BAYCOM_SER_HDX
-tristate 'BAYCOM picpar and par96 driver for AX.25' CONFIG_BAYCOM_PAR
-tristate 'BAYCOM epp driver for AX.25' CONFIG_BAYCOM_EPP
+dep_tristate 'BAYCOM picpar and par96 driver for AX.25' CONFIG_BAYCOM_PAR $CONFIG_PARPORT
+dep_tristate 'BAYCOM epp driver for AX.25' CONFIG_BAYCOM_EPP $CONFIG_PARPORT

tristate 'Soundcard modem driver' CONFIG_SOUNDMODEM
if [ "$CONFIG_SOUNDMODEM" != "n" ]; then
diff -u -r linux/net/wanrouter/wanmain.c /usr/src/linux/net/wanrouter/wanmain.c
--- linux/net/wanrouter/wanmain.c Tue Dec 29 10:47:29 1998
+++ /usr/src/linux/net/wanrouter/wanmain.c Tue Dec 29 10:55:01 1998
@@ -87,10 +87,8 @@
* Global Data
*/

-#ifdef MODULE
static char fullname[] = "WAN Router";
static char copyright[] = "(c) 1995-1997 Sangoma Technologies Inc.";
-#endif
static char modname[] = ROUTER_NAME; /* short module name */
wan_device_t * router_devlist = NULL; /* list of registered devices */
static int devcnt = 0;

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