projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda-gateway' into topic/hda
[cascardo/linux.git]
/
arch
/
arm
/
mach-mx2
/
pcm970-baseboard.c
diff --git
a/arch/arm/mach-mx2/pcm970-baseboard.c
b/arch/arm/mach-mx2/pcm970-baseboard.c
index
028ac4d
..
a560cd6
100644
(file)
--- a/
arch/arm/mach-mx2/pcm970-baseboard.c
+++ b/
arch/arm/mach-mx2/pcm970-baseboard.c
@@
-17,8
+17,7
@@
*/
#include <linux/platform_device.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
+#include <mach/hardware.h>
#include <asm/mach/arch.h>
/*