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 'topic/asoc' into for-linus
[pandora-kernel.git]
/
sound
/
ppc
/
beep.c
diff --git
a/sound/ppc/beep.c
b/sound/ppc/beep.c
index
89f5c32
..
a9d3507
100644
(file)
--- a/
sound/ppc/beep.c
+++ b/
sound/ppc/beep.c
@@
-215,7
+215,7
@@
static struct snd_kcontrol_new snd_pmac_beep_mixer = {
};
/* Initialize beep stuff */
-int __init snd_pmac_attach_beep(struct snd_pmac *chip)
+int __
dev
init snd_pmac_attach_beep(struct snd_pmac *chip)
{
struct pmac_beep *beep;
struct input_dev *input_dev;