diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 10:22:26 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 10:22:26 +0200 |
commit | 37acd687269f8cb8366598e292f96eb5605d3e3a (patch) | |
tree | e49cc91bef34755b9a279b60ed8d10ea01eec725 /drivers/media/i2c/tvp5150_reg.h | |
parent | Merge branch 'for-4.18/hid-redragon' into for-linus (diff) | |
parent | HID: steam: select CONFIG_POWER_SUPPLY (diff) | |
download | linux-37acd687269f8cb8366598e292f96eb5605d3e3a.tar.xz linux-37acd687269f8cb8366598e292f96eb5605d3e3a.zip |
Merge branch 'for-4.18/hid-steam' into for-linus
Valve Steam Controller support from Rodrigo Rivas Costa
Diffstat (limited to 'drivers/media/i2c/tvp5150_reg.h')
-rw-r--r-- | drivers/media/i2c/tvp5150_reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/tvp5150_reg.h b/drivers/media/i2c/tvp5150_reg.h index c43b7b844021..d3a764cae1a0 100644 --- a/drivers/media/i2c/tvp5150_reg.h +++ b/drivers/media/i2c/tvp5150_reg.h @@ -3,7 +3,7 @@ * * tvp5150 - Texas Instruments TVP5150A/AM1 video decoder registers * - * Copyright (c) 2005,2006 Mauro Carvalho Chehab <mchehab@infradead.org> + * Copyright (c) 2005,2006 Mauro Carvalho Chehab <mchehab@kernel.org> */ #define TVP5150_VD_IN_SRC_SEL_1 0x00 /* Video input source selection #1 */ |