projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-rk30
/
include
/
mach
/
rk30_camera.h
diff --git
a/arch/arm/mach-rk30/include/mach/rk30_camera.h
b/arch/arm/mach-rk30/include/mach/rk30_camera.h
index acb1ce975416681e1571baeca71d39996fb81b2a..85391efff2e304668aaa99b99a8a783abf786fb0 100755
(executable)
--- a/
arch/arm/mach-rk30/include/mach/rk30_camera.h
+++ b/
arch/arm/mach-rk30/include/mach/rk30_camera.h
@@
-19,7
+19,6
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ASM_ARCH_CAMERA_RK30_H_
-
#define __ASM_ARCH_CAMERA_RK30_H_
#ifdef CONFIG_ARCH_RK30