Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / sound / oss / sh_dac_audio.c

diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index 7ea9accc2ba4461dd5a543cec153b4c8ca729dde..b493660deb36b503b39a509861ebf54b2eb8254b 100644 (file)
--- 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);