2002-03-09 13:31:43

by Barry K. Nathan

Subject: [PATCH] 2.2.21-pre[34] pl2303.c non-modular compile fix

The pl2303 driver won't compile for me in Linux 2.2.21-pre3 or -pre4 if
modules are disabled. This might not be the right fix, but it allows the
driver to compile and work for me.

-Barry K. Nathan <[email protected]>

diff -ruN linux-2.2.21-pre3/drivers/usb/serial/pl2303.c linux-2.2.21-pre3-bknA-1/drivers/usb/serial/pl2303.c
--- linux-2.2.21-pre3/drivers/usb/serial/pl2303.c Sun Mar 3 23:20:11 2002
+++ linux-2.2.21-pre3-bknA-1/drivers/usb/serial/pl2303.c Sat Mar 9 04:45:08 2002
@@ -818,7 +818,9 @@
module_exit(pl2303_exit);

MODULE_DESCRIPTION(DRIVER_DESC);
+#ifdef CONFIG_MODULES
MODULE_LICENSE("GPL");
+#endif

MODULE_PARM(debug, "i");
MODULE_PARM_DESC(debug, "Debug enabled or not");

2002-03-10 01:32:36

by Keith Owens

Subject: Re: [PATCH] 2.2.21-pre[34] pl2303.c non-modular compile fix

On Sat, 9 Mar 2002 05:19:10 -0800 (PST),
[email protected] (Barry K. Nathan) wrote:
>The pl2303 driver won't compile for me in Linux 2.2.21-pre3 or -pre4 if
>modules are disabled. This might not be the right fix, but it allows the
>driver to compile and work for me.
>
>-Barry K. Nathan <[email protected]>
>
>diff -ruN linux-2.2.21-pre3/drivers/usb/serial/pl2303.c linux-2.2.21-pre3-bknA-1/drivers/usb/serial/pl2303.c
>--- linux-2.2.21-pre3/drivers/usb/serial/pl2303.c Sun Mar 3 23:20:11 2002
>+++ linux-2.2.21-pre3-bknA-1/drivers/usb/serial/pl2303.c Sat Mar 9 04:45:08 2002
>@@ -818,7 +818,9 @@
> module_exit(pl2303_exit);
>
> MODULE_DESCRIPTION(DRIVER_DESC);
>+#ifdef CONFIG_MODULES
> MODULE_LICENSE("GPL");
>+#endif
>
> MODULE_PARM(debug, "i");
> MODULE_PARM_DESC(debug, "Debug enabled or not");

The correct patch is to module.h. MODULE_LICENSE was added to
2.2.21-pre* as a compatibility patch but was incomplete.

Index: 21-pre4.1/include/linux/module.h
--- 21-pre4.1/include/linux/module.h Thu, 03 Jan 2002 20:12:00 +1100 kaos (linux-2.2/F/51_module.h 1.1.7.2.3.2 644)
+++ 21-pre4.1(w)/include/linux/module.h Sun, 10 Mar 2002 12:29:09 +1100 kaos (linux-2.2/F/51_module.h 1.1.7.2.3.2 644)
@@ -181,6 +181,7 @@ const char __module_device[] __attribute
s string
*/

+/* Dummy macro for 2.2/2.4 compatibility */
#define MODULE_LICENSE(var)

#define MODULE_PARM(var,type) \
@@ -221,6 +222,7 @@ const char __module_using_checksums[] __
#define MODULE_AUTHOR(name)
#define MODULE_DESCRIPTION(desc)
#define MODULE_SUPPORTED_DEVICE(name)
+#define MODULE_LICENSE(var)
#define MODULE_PARM(var,type)
#define MODULE_PARM_DESC(var,desc)
#define THIS_MODULE NULL