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://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
sound
/
oss
/
vidc_fill.S
diff --git
a/sound/oss/vidc_fill.S
b/sound/oss/vidc_fill.S
index
d2cb210
..
bed3492
100644
(file)
--- a/
sound/oss/vidc_fill.S
+++ b/
sound/oss/vidc_fill.S
@@
-11,7
+11,7
@@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <
asm/ar
ch/hardware.h>
+#include <
ma
ch/hardware.h>
#include <asm/hardware/iomd.h>
.text