Commit 0dcc1e61 authored by Robert Kuebel's avatar Robert Kuebel Committed by Linus Torvalds

[PATCH] 3c509.c - 2_2

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.
parent f3fa4e6a
...@@ -229,10 +229,6 @@ static struct isapnp_device_id el3_isapnp_adapters[] __initdata = { ...@@ -229,10 +229,6 @@ static struct isapnp_device_id el3_isapnp_adapters[] __initdata = {
{ } /* terminate list */ { } /* terminate list */
}; };
MODULE_DEVICE_TABLE(isapnp, el3_isapnp_adapters);
MODULE_LICENSE("GPL");
static u16 el3_isapnp_phys_addr[8][3]; static u16 el3_isapnp_phys_addr[8][3];
#endif /* __ISAPNP__ */ #endif /* __ISAPNP__ */
static int nopnp; static int nopnp;
...@@ -1265,6 +1261,8 @@ MODULE_PARM(nopnp, "i"); ...@@ -1265,6 +1261,8 @@ MODULE_PARM(nopnp, "i");
MODULE_PARM_DESC(nopnp, "disable ISA PnP support (0-1)"); MODULE_PARM_DESC(nopnp, "disable ISA PnP support (0-1)");
#endif /* __ISAPNP__ */ #endif /* __ISAPNP__ */
MODULE_DESCRIPTION("3Com Etherlink III (3c509, 3c509B) ISA/PnP ethernet driver"); MODULE_DESCRIPTION("3Com Etherlink III (3c509, 3c509B) ISA/PnP ethernet driver");
MODULE_DEVICE_TABLE(isapnp, el3_isapnp_adapters);
MODULE_LICENSE("GPL");
int int
init_module(void) init_module(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment