diff options
author | 2017-09-04 09:22:54 -0700 | |
---|---|---|
committer | 2017-09-04 09:22:54 -0700 | |
commit | a6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8 (patch) | |
tree | 8960e571a398b5d32e72bdb9c89ce965daa870ab /drivers/reset | |
parent | Input: xpad - fix PowerA init quirk for some gamepad models (diff) | |
parent | Input: byd - make array seq static, reduces object code size (diff) | |
download | wireguard-linux-a6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8.tar.xz wireguard-linux-a6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.14 merge window.
Diffstat (limited to 'drivers/reset')
-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"); |