projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-for-davem-2016-03-02' of git://git.kernel.org/pub/scm/linux/kerne...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
devices.c
diff --git
a/arch/arm/mach-omap1/devices.c
b/arch/arm/mach-omap1/devices.c
index
717f13d
..
8c8be86
100644
(file)
--- a/
arch/arm/mach-omap1/devices.c
+++ b/
arch/arm/mach-omap1/devices.c
@@
-25,7
+25,7
@@
#include <mach/mux.h>
#include <mach/omap7xx.h>
-#include
<mach/camera.h>
+#include
"camera.h"
#include <mach/hardware.h>
#include "common.h"