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 'exynos-drm' of git://git.infradead.org/users/kmpark/linux-samsung into...
[pandora-kernel.git]
/
sound
/
ppc
/
snd_ps3.c
diff --git
a/sound/ppc/snd_ps3.c
b/sound/ppc/snd_ps3.c
index
775bd95
..
1aa52ef
100644
(file)
--- a/
sound/ppc/snd_ps3.c
+++ b/
sound/ppc/snd_ps3.c
@@
-24,6
+24,7
@@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
+#include <linux/module.h>
#include <sound/asound.h>
#include <sound/control.h>
#include <sound/asound.h>
#include <sound/control.h>
@@
-875,7
+876,7
@@
static void __devinit snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
(0x0fUL << 12) |
(PS3_AUDIO_IOID);
(0x0fUL << 12) |
(PS3_AUDIO_IOID);
- ret = lv1_gpu_attribute(0x100, 0x007, val
, 0, 0
);
+ ret = lv1_gpu_attribute(0x100, 0x007, val);
if (ret)
pr_info("%s: gpu_attribute failed %d\n", __func__,
ret);
if (ret)
pr_info("%s: gpu_attribute failed %d\n", __func__,
ret);