Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / sound / arm / pxa2xx-pcm.c

diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c
index 9a104e2430f57f9f1f9210e323fd0b3387ea5a3d..381094aab2355e854914ad3f7c677f93f3e6b6e8 100644 (file)
--- a/sound/arm/pxa2xx-pcm.c
+++ b/sound/arm/pxa2xx-pcm.c
@@ -21,8 +21,8 @@
 #include <sound/pcm_params.h>
 
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 
 #include "pxa2xx-pcm.h"