appletalk patch

David Murn (scuffer@hups.apana.org.au)
Fri, 11 Sep 1998 00:41:00 +1000 (EST)

Hi all,
I sent this patch to Alan to fix a little bug in .120, but it
didn't get included, so I'm assuming it got dropped or missed. Here it is
again. Basically, the appletalk-IP driver requires functions which are in
the appletalk driver. The appletalk driver can be compiled as a module,
but if it is, and the appletalk-IP driver is compiled into the kernel, the
final link will fail. Basically, we only allow appletalk-IP to be
compiled as a module if appletalk has been compiled as a module.

Patch below. (this goes on 2.1.120 and 2.1.121.)

Davey

--- linux/drivers/net/Config.in- Sun Sep 6 22:31:56 1998
+++ linux/drivers/net/Config.in Sun Sep 6 22:30:43 1998
@@ -153,18 +153,16 @@
# AppleTalk
#
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- if [ "$CONFIG_ATALK" != "n" ]; then
- tristate 'Apple/Farallon LocalTalk PC support' CONFIG_LTPC
- tristate 'COPS LocalTalk PC support' CONFIG_COPS
- if [ "$CONFIG_COPS" != "n" ]; then
- bool 'Dayna firmware support' CONFIG_COPS_DAYNA
- bool 'Tangent firmware support' CONFIG_COPS_TANGENT
- fi
- tristate 'Appletalk-IP driver support' CONFIG_IPDDP
- if [ "$CONFIG_IPDDP" != "n" ]; then
- bool 'IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP
- bool 'Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP
- fi
+ dep_tristate 'Apple/Farallon LocalTalk PC support' CONFIG_LTPC $CONFIG_ATALK
+ dep_tristate 'COPS LocalTalk PC support' CONFIG_COPS
+ if [ "$CONFIG_COPS" != "n" ]; then
+ bool 'Dayna firmware support' CONFIG_COPS_DAYNA
+ bool 'Tangent firmware support' CONFIG_COPS_TANGENT
+ fi
+ dep_tristate 'Appletalk-IP driver support' CONFIG_IPDDP $CONFIG_ATALK
+ if [ "$CONFIG_IPDDP" != "n" ]; then
+ bool 'IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP
+ bool 'Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP
fi
fi

-
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/faq.html