diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-18 09:12:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-18 09:12:51 +0100 |
| commit | 7f9d04bc568d22e573a10e2a0a316599942786f7 (patch) | |
| tree | 5cd3f32a22ebcc0f0faed657da2fbeb5dd5592c5 /drivers/media/rc/streamzap.c | |
| parent | 9a38450ac3d1f665fdbe06a2fd2e06fcf70defbc (diff) | |
| parent | 1291a0d5049dbc06baaaf66a9ff3f53db493b19b (diff) | |
Merge 4.15-rc4 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/rc/streamzap.c')
| -rw-r--r-- | drivers/media/rc/streamzap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c index 4eebfcfc10f3..c9a70fda88a8 100644 --- a/drivers/media/rc/streamzap.c +++ b/drivers/media/rc/streamzap.c @@ -191,7 +191,7 @@ static void sz_push_half_space(struct streamzap_ir *sz, sz_push_full_space(sz, value & SZ_SPACE_MASK); } -/** +/* * streamzap_callback - usb IRQ handler callback * * This procedure is invoked on reception of data from @@ -321,7 +321,7 @@ out: return NULL; } -/** +/* * streamzap_probe * * Called by usb-core to associated with a candidate device @@ -450,7 +450,7 @@ free_sz: return retval; } -/** +/* * streamzap_disconnect * * Called by the usb core when the device is removed from the system. |