git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
exynos5250.dtsi
diff --git
a/arch/arm/boot/dts/exynos5250.dtsi
b/arch/arm/boot/dts/exynos5250.dtsi
index 0aa9091ed7c5a6678f247e8e049075e830c25cd9..964158c1844f5408c80dae93f1c579814218598e 100644
(file)
--- a/
arch/arm/boot/dts/exynos5250.dtsi
+++ b/
arch/arm/boot/dts/exynos5250.dtsi
@@
-169,9
+169,9
@@
interrupts = <0 50 0>;
};
- pinctrl_3: pinctrl@03
68
0000 {
+ pinctrl_3: pinctrl@03
86
0000 {
compatible = "samsung,exynos5250-pinctrl";
- reg = <0x03
68
000 0x1000>;
+ reg = <0x03
860
000 0x1000>;
interrupts = <0 47 0>;
};