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 branch 'fix/misc' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
mach-pcm037.c
diff --git
a/arch/arm/mach-mx3/mach-pcm037.c
b/arch/arm/mach-mx3/mach-pcm037.c
index
11f5315
..
2df1ec5
100644
(file)
--- a/
arch/arm/mach-mx3/mach-pcm037.c
+++ b/
arch/arm/mach-mx3/mach-pcm037.c
@@
-35,7
+35,7
@@
#include <linux/can/platform/sja1000.h>
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
-#include <linux/
fsl_devices
.h>
+#include <linux/
gfp
.h>
#include <media/soc_camera.h>