summaryrefslogtreecommitdiff
path: root/sound/oss/sh_dac_audio.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 07:50:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 07:50:00 -0700
commit2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29 (patch)
tree62a49268a6baa58b25c76e5deae21f9b49bcc626 /sound/oss/sh_dac_audio.c
parent5cfc35cf79d46af998346e3d5cc66fa344d1af0e (diff)
parent66a740572d7bcb18469e71cb014bfed3ff75a773 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Convert INTC2 to IRQ table registration. sh: Updates for irq-flow-type naming changes. sh: Add some missing board headers. sh: Fix exception_handling_table alignment. sh: Cleanup board header directories. sh: Remove board-specific ide.h headers. sh: Proper show_stack/show_trace() implementation.
Diffstat (limited to 'sound/oss/sh_dac_audio.c')
-rw-r--r--sound/oss/sh_dac_audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index 3b3b4da8cfd..51f554154c4 100644
--- 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"