diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:05 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:05 +0100 |
commit | ae33625512143ac277d96a26e1390c7935259373 (patch) | |
tree | c5778e683f420db28bf4a6999bc2eeb2f245eb35 /arch | |
parent | 8b7f29cd053da9565b06e6ad705590843ba93c9b (diff) | |
parent | 405f6292092375b00d43a2e241c6d3023f7de2f8 (diff) | |
download | barebox-ae33625512143ac277d96a26e1390c7935259373.tar.gz barebox-ae33625512143ac277d96a26e1390c7935259373.tar.xz |
Merge branch 'for-next/dts'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/dts/am33xx-strip.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-strip.dtsi index 04cf3151ea..2943fd1cc3 100644 --- a/arch/arm/dts/am33xx-strip.dtsi +++ b/arch/arm/dts/am33xx-strip.dtsi @@ -45,3 +45,4 @@ /delete-node/ &rng; /delete-node/ &rtc; /delete-node/ &wkup_m3; +/delete-node/ &wkup_m3_ipc; |