Merge tag 'reset-fixes-for-4.12' of git://git.pengutronix.de/git/pza/…

…linux into fixes Reset controller fixes for v4.12 - Set hi6220_reset driver module license to GPL v2 to fix module loading. * tag 'reset-fixes-for-4.12' of git://git.pengutronix.de/git/pza/linux: reset: hi6220: Set module license so that it can be loaded Signed-off-by: Olof Johansson <olof@lixom.net>
mariux64 · Jun 2, 2017 · 84d40c0 · 84d40c0
2 parents da3d1d4 + 4497a22
commit 84d40c0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c
@@ -155,3 +155,5 @@ static int __init hi6220_reset_init(void)
 }
 
 postcore_initcall(hi6220_reset_init);
+
+MODULE_LICENSE("GPL v2");