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:
63414aa
2da4db5
)
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
author
Dima Zavin
<dima@android.com>
Tue, 14 Dec 2010 22:25:27 +0000
(14:25 -0800)
committer
Dima Zavin
<dima@android.com>
Tue, 14 Dec 2010 22:25:27 +0000
(14:25 -0800)
Conflicts:
arch/arm/mach-tegra/tegra2_clocks.c
Change-Id: Ia10990fca6221d4d7d0236073910d8c48bf6762b
1
2
arch/arm/mach-tegra/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-tegra/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-tegra/include/mach/iomap.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-tegra/tegra2_clocks.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-tegra/Kconfig
Simple merge
diff --cc
arch/arm/mach-tegra/Makefile
Simple merge
diff --cc
arch/arm/mach-tegra/include/mach/iomap.h
Simple merge
diff --cc
arch/arm/mach-tegra/tegra2_clocks.c
index c8f6ca9cfdd471bd23c8447a1db56854bb881e7e,3625b8091c76d14a5bf1de7b7971b16fd5d5e704..6aacf8f11f0534cc26a3cd0bd2068c1b3bdc99f8
---
1
/
arch/arm/mach-tegra/tegra2_clocks.c
---
2
/
arch/arm/mach-tegra/tegra2_clocks.c
+++ b/
arch/arm/mach-tegra/tegra2_clocks.c
@@@
-2035,7
-2035,7
+2035,8
@@@
struct clk_duplicate tegra_clk_duplicat
CLK_DUPLICATE("epp", "tegra_grhost", "epp"),
CLK_DUPLICATE("mpe", "tegra_grhost", "mpe"),
CLK_DUPLICATE("cop", "tegra-avp", "cop"),
+ CLK_DUPLICATE("vde", "tegra-aes", "vde"),
+ CLK_DUPLICATE("usbd", "cpcap-otg", NULL),
};
#define CLK(dev, con, ck) \