diff options
| author | Kristoffer Ericson <Kristoffer_e1@hotmail.com> | 2007-03-19 16:12:13 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@hera.kernel.org> | 2007-05-07 02:10:54 +0000 |
| commit | 5753171b8234b98d35d559abc0d88b9e4b520b14 (patch) | |
| tree | f9b5bfd736a689d3ccb0a821cc836bcfcee4950d | |
| parent | d29c91c70bc7790b112119135fae7690cbf17577 (diff) | |
| download | linux-5753171b8234b98d35d559abc0d88b9e4b520b14.tar.gz linux-5753171b8234b98d35d559abc0d88b9e4b520b14.tar.bz2 linux-5753171b8234b98d35d559abc0d88b9e4b520b14.zip | |
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>
| -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 @@ static void do_softint(void *data); static struct input_dev *hp680_ts_dev; -static DECLARE_WORK(work, do_softint, 0); +static DECLARE_WORK(work, do_softint); static void do_softint(void *data) { 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) unsigned long interval; struct clk *clk; - clk = clk_get("module_clk"); + clk = clk_get(NULL, "module_clk"); interval = (clk_get_rate(clk) / 4) / rate; clk_put(clk); ctrl_outl(interval, TMU1_TCOR); |