[PATCH] [TRIVIAL] 3c509.c - 2/2

[PATCH] [TRIVIAL] 3c509.c - 2/2

[kuebelr]

This patch makes sure the 3c509 module license is always GPL.  Currently
the MODULE_LICENSE() marco is only used when CONFIG_ISAPNP or
CONFIG_ISAPNP_MODULE is defined.  I have moved MODULE_LICENSE() to the
#ifdef MODULE section at the bottom of 3c509.c.

Same is true for the MODULE_DEVICE_TABLE() macro.

Patch is agains 2.4.19-pre10.

Rob.

--- linux-clean/drivers/net/3c509.c     Fri Jun  7 23:41:59 2002
+++ linux-dirty/drivers/net/3c509.c     Thu Jun 13 00:18:18 2002
@@ -229,10 +229,6 @@
        { }     /* terminate list */
 };
 
-MODULE_DEVICE_TABLE(isapnp, el3_isapnp_adapters);
-MODULE_LICENSE("GPL");
-
-
 static u16 el3_isapnp_phys_addr[8][3];
 #endif /* CONFIG_ISAPNP || CONFIG_ISAPNP_MODULE */
 static int nopnp;
@@ -1265,6 +1261,8 @@
 MODULE_PARM_DESC(nopnp, "disable ISA PnP support (0-1)");
 #endif /* CONFIG_ISAPNP */
 MODULE_DESCRIPTION("3Com Etherlink III (3c509, 3c509B) ISA/PnP ethernet driver");
+MODULE_DEVICE_TABLE(isapnp, el3_isapnp_adapters);
+MODULE_LICENSE("GPL");
 
 int
 init_module(void)

Re: [PATCH] [TRIVIAL] 3c509.c - 2/2

[Jeff Garzik]

kuebelr@email.uc.edu wrote:
>  static u16 el3_isapnp_phys_addr[8][3];
>  #endif /* CONFIG_ISAPNP || CONFIG_ISAPNP_MODULE */
>  static int nopnp;
> @@ -1265,6 +1261,8 @@
>  MODULE_PARM_DESC(nopnp, "disable ISA PnP support (0-1)");
>  #endif /* CONFIG_ISAPNP */
>  MODULE_DESCRIPTION("3Com Etherlink III (3c509, 3c509B) ISA/PnP ethernet driver");
> +MODULE_DEVICE_TABLE(isapnp, el3_isapnp_adapters);

it doesn't make much sense to have the isapnp device table outside the 
isapnp ifdef.

	Jeff