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 'kbuild-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
exynos5250-spring.dts
diff --git
a/arch/arm/boot/dts/exynos5250-spring.dts
b/arch/arm/boot/dts/exynos5250-spring.dts
index 4d7bdb735ed3b6d8c1c338e49634c6b04b6e8bd3..95c3bcace9dcbe8fcc233a17d88320f3ffd73fd6 100644
(file)
--- a/
arch/arm/boot/dts/exynos5250-spring.dts
+++ b/
arch/arm/boot/dts/exynos5250-spring.dts
@@
-14,7
+14,6
@@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/input/input.h>
#include "exynos5250.dtsi"
-#include "exynos-mfc-reserved-memory.dtsi"
/ {
model = "Google Spring";