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 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
sound
/
parisc
/
harmony.c
diff --git
a/sound/parisc/harmony.c
b/sound/parisc/harmony.c
index
cf60333
..
99f5483
100644
(file)
--- a/
sound/parisc/harmony.c
+++ b/
sound/parisc/harmony.c
@@
-45,7
+45,6
@@
#include <linux/spinlock.h>
#include <linux/dma-mapping.h>
#include <linux/spinlock.h>
#include <linux/dma-mapping.h>
-#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/control.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/control.h>
@@
-854,7
+853,7
@@
static struct snd_kcontrol_new snd_harmony_controls[] = {
HARMONY_GAIN_HE_SHIFT, 1, 0),
};
HARMONY_GAIN_HE_SHIFT, 1, 0),
};
-static void __
init
+static void __
devinit
snd_harmony_mixer_reset(struct snd_harmony *h)
{
harmony_mute(h);
snd_harmony_mixer_reset(struct snd_harmony *h)
{
harmony_mute(h);
@@
-863,7
+862,7
@@
snd_harmony_mixer_reset(struct snd_harmony *h)
harmony_unmute(h);
}
harmony_unmute(h);
}
-static int __
init
+static int __
devinit
snd_harmony_mixer_init(struct snd_harmony *h)
{
struct snd_card *card = h->card;
snd_harmony_mixer_init(struct snd_harmony *h)
{
struct snd_card *card = h->card;