2008-06-20 11:07:33

by Ben Dooks

Subject: MMC: correct card drivers MODULE_LICENSE() statements

Both the mmc_test and sdio_uart drivers' headers show that
they are licenses under GPL version 2, but the MODULE_LICENSE
statements say "GPL". Change the licensing statement to better
reflect their licensing.

CC: Nicolas Pitre <[email protected]>
Signed-off-by: Ben Dooks <[email protected]>

Index: linux-2.6.26-rc6-sdmmc3/drivers/mmc/card/mmc_test.c
===================================================================
--- linux-2.6.26-rc6-sdmmc3.orig/drivers/mmc/card/mmc_test.c 2008-06-20 12:03:32.000000000 +0100
+++ linux-2.6.26-rc6-sdmmc3/drivers/mmc/card/mmc_test.c 2008-06-20 12:03:38.000000000 +0100
@@ -893,6 +893,6 @@ static void __exit mmc_test_exit(void)
module_init(mmc_test_init);
module_exit(mmc_test_exit);

-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("Multimedia Card (MMC) host test driver");
MODULE_AUTHOR("Pierre Ossman");
Index: linux-2.6.26-rc6-sdmmc3/drivers/mmc/card/sdio_uart.c
===================================================================
--- linux-2.6.26-rc6-sdmmc3.orig/drivers/mmc/card/sdio_uart.c 2008-06-20 12:02:57.000000000 +0100
+++ linux-2.6.26-rc6-sdmmc3/drivers/mmc/card/sdio_uart.c 2008-06-20 12:03:06.000000000 +0100
@@ -1155,4 +1155,4 @@ module_init(sdio_uart_init);
module_exit(sdio_uart_exit);

MODULE_AUTHOR("Nicolas Pitre");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

--
Ben ([email protected], http://www.fluff.org/)

'a smiley only costs 4 bytes'

2008-06-20 17:07:28

by Pierre Ossman

Subject: Re: MMC: correct card drivers MODULE_LICENSE() statements

On Fri, 20 Jun 2008 12:07:02 +0100
[email protected] wrote:

> Both the mmc_test and sdio_uart drivers' headers show that
> they are licenses under GPL version 2, but the MODULE_LICENSE
> statements say "GPL". Change the licensing statement to better
> reflect their licensing.
>

This is the same in the entire drivers/mmc subtree. Also, some are v2
only, some are v2 or later. I don't know if there is a consensus on the
naming of these yet. Anyway, it's just used for protecting GPL-only
symbols, so I don't see much point in extending the tag beyond its
current form.

Rgds
--
-- Pierre Ossman

Linux kernel, MMC maintainer http://www.kernel.org
rdesktop, core developer http://www.rdesktop.org

WARNING: This correspondence is being monitored by the
Swedish government. Use end-to-end encryption where
possible.