git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
sound
/
oss
/
sh_dac_audio.c
diff --git
a/sound/oss/sh_dac_audio.c
b/sound/oss/sh_dac_audio.c
index
83ff8a7
..
b493660
100644
(file)
--- a/
sound/oss/sh_dac_audio.c
+++ b/
sound/oss/sh_dac_audio.c
@@
-26,7
+26,7
@@
#include <asm/cpu/dac.h>
#include <asm/cpu/timer.h>
#include <asm/machvec.h>
#include <asm/cpu/dac.h>
#include <asm/cpu/timer.h>
#include <asm/machvec.h>
-#include <asm/hp6xx
/hp6xx
.h>
+#include <asm/hp6xx.h>
#include <asm/hd64461.h>
#define MODNAME "sh_dac_audio"
#include <asm/hd64461.h>
#define MODNAME "sh_dac_audio"
@@
-104,7
+104,7
@@
static void dac_audio_set_rate(void)
unsigned long interval;
struct clk *clk;
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);
interval = (clk_get_rate(clk) / 4) / rate;
clk_put(clk);
ctrl_outl(interval, TMU1_TCOR);
@@
-255,7
+255,7
@@
static int dac_audio_release(struct inode *inode, struct file *file)
return 0;
}
return 0;
}
-struct file_operations dac_audio_fops = {
+
const
struct file_operations dac_audio_fops = {
.read = dac_audio_read,
.write = dac_audio_write,
.ioctl = dac_audio_ioctl,
.read = dac_audio_read,
.write = dac_audio_write,
.ioctl = dac_audio_ioctl,
@@
-263,7
+263,7
@@
struct file_operations dac_audio_fops = {
.release = dac_audio_release,
};
.release = dac_audio_release,
};
-static irqreturn_t timer1_interrupt(int irq, void *dev
, struct pt_regs *regs
)
+static irqreturn_t timer1_interrupt(int irq, void *dev)
{
unsigned long timer_status;
{
unsigned long timer_status;