Merge remote-tracking branch 'origin/at91-5.10-trunk/wilc_new' into linux-5.10-at91

cristibirsan · cristibirsan · commit f828d684531f · 2021-07-20T15:51:14.000+03:00
diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -1134,4 +1134,4 @@ module_driver(wilc_sdio_driver,
 	      sdio_register_driver,
 	      sdio_unregister_driver);
 MODULE_LICENSE("GPL");
-MODULE_VERSION("15.4.1");
+MODULE_VERSION("15.5");
diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c
@@ -290,7 +290,7 @@ static struct spi_driver wilc_spi_driver = {
 };
 module_spi_driver(wilc_spi_driver);
 MODULE_LICENSE("GPL");
-MODULE_VERSION("15.4.1");
+MODULE_VERSION("15.5");
 
 static int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len)
 {

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ static struct spi_driver wilc_spi_driver = {`
`290`	`290`	`};`
`291`	`291`	`module_spi_driver(wilc_spi_driver);`
`292`	`292`	`MODULE_LICENSE("GPL");`
`293`		`-MODULE_VERSION("15.4.1");`
	`293`	`+MODULE_VERSION("15.5");`
`294`	`294`
`295`	`295`	`static int wilc_spi_tx(struct wilc wilc, u8 b, u32 len)`
`296`	`296`	`{`