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 branches 'release', 'cpuidle-2.6.25' and 'idle' into release
[pandora-kernel.git]
/
sound
/
sparc
/
amd7930.c
diff --git
a/sound/sparc/amd7930.c
b/sound/sparc/amd7930.c
index
be0bd50
..
0c63e05
100644
(file)
--- a/
sound/sparc/amd7930.c
+++ b/
sound/sparc/amd7930.c
@@
-36,7
+36,6
@@
#include <linux/interrupt.h>
#include <linux/moduleparam.h>
#include <linux/interrupt.h>
#include <linux/moduleparam.h>
-#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/info.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/info.h>
@@
-491,7
+490,7
@@
static void __amd7930_update_map(struct snd_amd7930 *amd)
__amd7930_write_map(amd);
}
__amd7930_write_map(amd);
}
-static irqreturn_t snd_amd7930_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t snd_amd7930_interrupt(int irq, void *dev_id)
{
struct snd_amd7930 *amd = dev_id;
unsigned int elapsed;
{
struct snd_amd7930 *amd = dev_id;
unsigned int elapsed;
@@
-859,7
+858,7
@@
static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem
spin_lock_irqsave(&amd->lock, flags);
if (*swval != ucontrol->value.integer.value[0]) {
spin_lock_irqsave(&amd->lock, flags);
if (*swval != ucontrol->value.integer.value[0]) {
- *swval = ucontrol->value.integer.value[0];
+ *swval = ucontrol->value.integer.value[0]
& 0xff
;
__amd7930_update_map(amd);
change = 1;
} else
__amd7930_update_map(amd);
change = 1;
} else
@@
-1067,8
+1066,8
@@
out_err:
static int __devinit amd7930_obio_attach(struct device_node *dp)
{
static int __devinit amd7930_obio_attach(struct device_node *dp)
{
- struct linux_prom_registers *regs;
- struct linux_prom_irqs *irqp;
+
const
struct linux_prom_registers *regs;
+
const
struct linux_prom_irqs *irqp;
struct resource res, *rp;
int len;
struct resource res, *rp;
int len;