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 master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
[pandora-kernel.git]
/
sound
/
oss
/
sh_dac_audio.c
diff --git
a/sound/oss/sh_dac_audio.c
b/sound/oss/sh_dac_audio.c
index
3b3b4da
..
51f5541
100644
(file)
--- a/
sound/oss/sh_dac_audio.c
+++ b/
sound/oss/sh_dac_audio.c
@@
-26,7
+26,7
@@
#include <asm/cpu/dac.h>
#include <asm/cpu/timer.h>
#include <asm/machvec.h>
-#include <asm/hp6xx
/hp6xx
.h>
+#include <asm/hp6xx.h>
#include <asm/hd64461.h>
#define MODNAME "sh_dac_audio"