diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:30 +0200 |
| commit | e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39 (patch) | |
| tree | fd2a441a7528003e0876ef0a4209cd7d9e28e7bc /dts/src/arm/ste-nomadik-s8815.dts | |
| parent | 8b464dc6eec4d1fd58875451671456393181e980 (diff) | |
| parent | e8ee06fe59e468dcd7404b8eed75d78af9c02593 (diff) | |
| download | barebox-e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39.tar.gz barebox-e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39.tar.xz | |
Merge branch 'for-next/dts'
Diffstat (limited to 'dts/src/arm/ste-nomadik-s8815.dts')
| -rw-r--r-- | dts/src/arm/ste-nomadik-s8815.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dts/src/arm/ste-nomadik-s8815.dts b/dts/src/arm/ste-nomadik-s8815.dts index f557feb997..90d8b6c7a2 100644 --- a/dts/src/arm/ste-nomadik-s8815.dts +++ b/dts/src/arm/ste-nomadik-s8815.dts @@ -4,7 +4,7 @@ */ /dts-v1/; -/include/ "ste-nomadik-stn8815.dtsi" +#include "ste-nomadik-stn8815.dtsi" / { model = "Calao Systems USB-S8815"; |