summaryrefslogtreecommitdiffstats
path: root/scripts/dtc/version_gen.h
diff options
context:
space:
mode:
authorJohn Bonesio <bones@secretlab.ca>2010-11-18 00:28:20 +0100
committerGrant Likely <grant.likely@secretlab.ca>2011-01-04 00:02:49 +0100
commit658f29a51e9830e620bb9a1ce3534b318a38bfeb (patch)
treee6cc7cd9b9e17d97308619fd8516b77bcc038114 /scripts/dtc/version_gen.h
parentof/device: Don't register disabled devices (diff)
downloadlinux-658f29a51e9830e620bb9a1ce3534b318a38bfeb.tar.xz
linux-658f29a51e9830e620bb9a1ce3534b318a38bfeb.zip
of/flattree: Update dtc to current mainline.
Pull in recent changes from the main dtc repository. These changes primarily allow multiple device trees to be declared which are merged by dtc. This feature allows us to include a basic dts file and then provide more information for the specific system through the merging functionality. Changes pulled from git://git.jdl.com/software/dtc.git commit id: 37c0b6a0, "dtc: Add code to make diffing trees easier" Signed-off-by: John Bonesio <bones@secretlab.ca> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'scripts/dtc/version_gen.h')
-rw-r--r--scripts/dtc/version_gen.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dtc/version_gen.h b/scripts/dtc/version_gen.h
index 658ff42429d6..6158b867df99 100644
--- a/scripts/dtc/version_gen.h
+++ b/scripts/dtc/version_gen.h
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.2.0"
+#define DTC_VERSION "DTC 1.2.0-g37c0b6a0"