diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-01 16:54:14 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-01 17:07:33 -0700 |
| commit | 84d40c0b73966a62c4d0f40288636a2f66cac3df (patch) | |
| tree | 4d0142719ddcee53f49e45e47743abc2f22f1b46 | |
| parent | da3d1d4a4e6c554237466db060d53abbf0620605 (diff) | |
| parent | 4497a224f759cd8350e07382307b55f870ef0df2 (diff) | |
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>
| -rw-r--r-- | drivers/reset/hisilicon/hi6220_reset.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c index 35ce53edabf9..d5e5229308f2 100644 --- 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"); |