diff options
-rw-r--r-- | drivers/input/touchscreen/hp680_ts_input.c | 2 | ||||
-rw-r--r-- | sound/oss/sh_dac_audio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c index 249087472740..61c15024c2a0 100644 --- a/drivers/input/touchscreen/hp680_ts_input.c +++ b/drivers/input/touchscreen/hp680_ts_input.c | |||
@@ -21,7 +21,7 @@ | |||
21 | static void do_softint(void *data); | 21 | static void do_softint(void *data); |
22 | 22 | ||
23 | static struct input_dev *hp680_ts_dev; | 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 | static void do_softint(void *data) | 26 | static void do_softint(void *data) |
27 | { | 27 | { |
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c index 7ea9accc2ba4..b493660deb36 100644 --- a/sound/oss/sh_dac_audio.c +++ b/sound/oss/sh_dac_audio.c | |||
@@ -104,7 +104,7 @@ static void dac_audio_set_rate(void) | |||
104 | unsigned long interval; | 104 | unsigned long interval; |
105 | struct clk *clk; | 105 | struct clk *clk; |
106 | 106 | ||
107 | clk = clk_get("module_clk"); | 107 | clk = clk_get(NULL, "module_clk"); |
108 | interval = (clk_get_rate(clk) / 4) / rate; | 108 | interval = (clk_get_rate(clk) / 4) / rate; |
109 | clk_put(clk); | 109 | clk_put(clk); |
110 | ctrl_outl(interval, TMU1_TCOR); | 110 | ctrl_outl(interval, TMU1_TCOR); |