diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-08-27 15:09:45 +0300 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-08-27 15:09:45 +0300 |
commit | 4461e9e5c374f8c11fee8e4a0e3290b072cfd538 (patch) | |
tree | 3bb5c91e53e98e6b80020e63d2d3ec14f94c0533 /drivers/char/ds1620.c | |
parent | 3f53d7e442197b7e7d56b470b02dfd37a8bc5c46 (diff) | |
parent | 5be63fc19fcaa4c236b307420483578a56986a37 (diff) | |
download | linux-4461e9e5c374f8c11fee8e4a0e3290b072cfd538.tar.xz |
Merge v6.11-rc5 into drm-next
amdgpu pr conconflicts due to patches cherry-picked to -fixes, I might
as well catch up with a backmerge and handle them all. Plus both misc
and intel maintainers asked for a backmerge anyway.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/char/ds1620.c')
-rw-r--r-- | drivers/char/ds1620.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c index cf89a9631107..a4f4291b4492 100644 --- a/drivers/char/ds1620.c +++ b/drivers/char/ds1620.c @@ -421,4 +421,5 @@ static void __exit ds1620_exit(void) module_init(ds1620_init); module_exit(ds1620_exit); +MODULE_DESCRIPTION("Dallas Semiconductor DS1620 thermometer driver"); MODULE_LICENSE("GPL"); |