diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 13:29:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 13:29:31 -0700 |
| commit | d985524680b77a1cf90738db9a2d72065a746afa (patch) | |
| tree | 101857c3e59f9238b0c7d4bbbf58e46476957387 /scripts/dtc/dtx_diff | |
| parent | 2007eafd9df71375d443192bbbe7aa2175992477 (diff) | |
| parent | ef954844c7ace62f773f4f23e28d2d915adc419f (diff) | |
| download | lwn-d985524680b77a1cf90738db9a2d72065a746afa.tar.gz lwn-d985524680b77a1cf90738db9a2d72065a746afa.zip | |
Merge 4.13-rc5 into char-misc-next
We want the firmware, and other changes, in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/dtc/dtx_diff')
| -rwxr-xr-x | scripts/dtc/dtx_diff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff index fb86f3899e16..f9a3d8d23c64 100755 --- a/scripts/dtc/dtx_diff +++ b/scripts/dtc/dtx_diff @@ -321,7 +321,7 @@ fi cpp_flags="\ -nostdinc \ -I${srctree}/arch/${ARCH}/boot/dts \ - -I${srctree}/arch/${ARCH}/boot/dts/include \ + -I${srctree}/scripts/dtc/include-prefixes \ -I${srctree}/drivers/of/testcase-data \ -undef -D__DTS__" |