projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52a12a7
5d47678
)
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
author
Dima Zavin
<dima@android.com>
Mon, 8 Nov 2010 08:04:30 +0000
(
00:04
-0800)
committer
Dima Zavin
<dima@android.com>
Mon, 8 Nov 2010 08:04:30 +0000
(
00:04
-0800)
Conflicts:
arch/arm/mach-tegra/devices.h
arch/arm/mach-tegra/include/mach/iomap.h
Change-Id: I4c37389a3ac359b274bf4b45d7a1fb8cfae8c1f9
1
2
arch/arm/mach-tegra/tegra2_clocks.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/media/video/tegra/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/media/video/tegra/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-tegra/tegra2_clocks.c
Simple merge
diff --cc
drivers/media/video/tegra/Kconfig
Simple merge
diff --cc
drivers/media/video/tegra/Makefile
index b0274a04b40de047dc171b83816e33e7e1b172d3,68b5c42b0e7aa78bb93f3ad882c07ffd321accaf..1a70f4bc7d4b93f952b61e02cea70bb35dcb4319
---
1
/
drivers/media/video/tegra/Makefile
---
2
/
drivers/media/video/tegra/Makefile
+++ b/
drivers/media/video/tegra/Makefile
@@@
-1,4
-1,2
+1,5
@@@
+ obj-y += avp/
obj-$(CONFIG_TEGRA_CAMERA) += tegra_camera.o
+obj-$(CONFIG_VIDEO_OV5650) += ov5650.o
+obj-$(CONFIG_VIDEO_SOC2030) += soc2030.o
+obj-$(CONFIG_VIDEO_DW9714L) += dw9714l.o
projects / firefly-linux-kernel-4.4.55.git / commitdiff