diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-10 10:52:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-10 10:52:40 +0100 |
| commit | cb1f34ddccb46f7c1bb61e98b7d44751a20c7e49 (patch) | |
| tree | 6cbcf7e9d87bc571b80ec1f75b5cb21a8e34b937 /drivers/media/pci/solo6x10/solo6x10-enc.c | |
| parent | sched/fair: Remove unused 'curr' parameter from wakeup_gran (diff) | |
| parent | membarrier: Disable preemption when calling smp_call_function_many() (diff) | |
| download | linux-cb1f34ddccb46f7c1bb61e98b7d44751a20c7e49.tar.xz linux-cb1f34ddccb46f7c1bb61e98b7d44751a20c7e49.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/pci/solo6x10/solo6x10-enc.c')
| -rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10-enc.c b/drivers/media/pci/solo6x10/solo6x10-enc.c index d28211bb9674..58d6b5131dd0 100644 --- a/drivers/media/pci/solo6x10/solo6x10-enc.c +++ b/drivers/media/pci/solo6x10/solo6x10-enc.c @@ -175,7 +175,7 @@ out: return 0; } -/** +/* * Set channel Quality Profile (0-3). */ void solo_s_jpeg_qp(struct solo_dev *solo_dev, unsigned int ch, |