Merge branch 'spi-4.20' into spi-4.21 for bcm stuff.

[linux-2.6-block.git] / drivers / spi / spi-bcm2835.c

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 774161bbcb2e90b803d9ccf2c55559b79536de55..43c6ca535800a4d18996d4ec4bd5873626b3cfcf 100644 (file)
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -841,4 +841,4 @@ module_platform_driver(bcm2835_spi_driver);
 
 MODULE_DESCRIPTION("SPI controller driver for Broadcom BCM2835");
 MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");