From 3067974ebc84d1c7f606046a7e64bd999df703c1 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 19 Mar 2007 16:12:13 +0900 Subject: [PATCH] --- yaml --- r: 54351 b: refs/heads/master c: 5753171b8234b98d35d559abc0d88b9e4b520b14 h: refs/heads/master i: 54349: 5540e427ad4616375c1d5a18cdc99e2ac10edc2f 54347: 1d2e9a66d5b5837412660623c608a86388072ac1 54343: cd8626fd97d1ea5df1a3e4538d53ec07513c4abc 54335: 602210dfda7922adc25ed4524b10a0e54de0e5e4 v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/hp680_ts_input.c | 2 +- trunk/sound/oss/sh_dac_audio.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8c2eb7cc224b..c1862a398b57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d29c91c70bc7790b112119135fae7690cbf17577 +refs/heads/master: 5753171b8234b98d35d559abc0d88b9e4b520b14 diff --git a/trunk/drivers/input/touchscreen/hp680_ts_input.c b/trunk/drivers/input/touchscreen/hp680_ts_input.c index 249087472740..61c15024c2a0 100644 --- a/trunk/drivers/input/touchscreen/hp680_ts_input.c +++ b/trunk/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/trunk/sound/oss/sh_dac_audio.c b/trunk/sound/oss/sh_dac_audio.c index 7ea9accc2ba4..b493660deb36 100644 --- a/trunk/sound/oss/sh_dac_audio.c +++ b/trunk/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);