Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5753171b8234b98d35d559abc0d88b9e4b520b14

Authored by Kristoffer Ericson
Committed by Paul Mundt
1 parent d29c91c70b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sh: hp6xx driver compile fixes. 

Trivial compilation fixes for the hp6xx drivers.

Signed-off-by: Kristoffer Ericson <Kristoffer_e1@hotmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/input/touchscreen/hp680_ts_input.c
Diff comments   View file @ 5753171
... ... @@ -21,7 +21,7 @@
21 21 static void do_softint(void *data);
22 22  
23 23 static struct input_dev *hp680_ts_dev;
24   -static DECLARE_WORK(work, do_softint, 0);
  24 +static DECLARE_WORK(work, do_softint);
25 25  
26 26 static void do_softint(void *data)
27 27 {
sound/oss/sh_dac_audio.c
Diff comments   View file @ 5753171
... ... @@ -104,7 +104,7 @@
104 104 unsigned long interval;
105 105 struct clk *clk;
106 106  
107   - clk = clk_get("module_clk");
  107 + clk = clk_get(NULL, "module_clk");
108 108 interval = (clk_get_rate(clk) / 4) / rate;
109 109 clk_put(clk);
110 110 ctrl_outl(interval, TMU1_TCOR);