From: Kristoffer Ericson Date: Mon, 19 Mar 2007 07:12:13 +0000 (+0900) Subject: sh: hp6xx driver compile fixes. X-Git-Tag: v2.6.22-rc1~825^2~27 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5753171b8234b98d35d559abc0d88b9e4b520b14;p=linux-2.6 sh: hp6xx driver compile fixes. Trivial compilation fixes for the hp6xx drivers. Signed-off-by: Kristoffer Ericson Signed-off-by: Paul Mundt --- diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c index 2490874727..61c15024c2 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 7ea9accc2b..b493660deb 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);