Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / sound / oss / omap-audio.c

diff --git a/sound/oss/omap-audio.c b/sound/oss/omap-audio.c
index 84f544598ef07ee65812d9fdcf7c1942ba41cd5d..95b5eef11847d87f705f18665bf33916a6195061 100644 (file)
--- a/sound/oss/omap-audio.c
+++ b/sound/oss/omap-audio.c
@@ -49,7 +49,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #include "omap-audio-dma-intfc.h"
 #include "omap-audio.h"