diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-15 08:24:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-15 08:24:53 +0200 |
| commit | d4b80afbba49e968623330f1336da8c724da8aad (patch) | |
| tree | a9478bd77d8b001a6a7119328d34e9666d7bfe93 /arch/arm/boot/dts/am335x-igep0033.dtsi | |
| parent | x86/dumpstack: Add recursion checking for all stacks (diff) | |
| parent | Merge tag 'pci-v4.8-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-d4b80afbba49e968623330f1336da8c724da8aad.tar.xz linux-d4b80afbba49e968623330f1336da8c724da8aad.zip | |
Merge branch 'linus' into x86/asm, to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/am335x-igep0033.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am335x-igep0033.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi index df63484ef9b3..e7d9ca1305fa 100644 --- a/arch/arm/boot/dts/am335x-igep0033.dtsi +++ b/arch/arm/boot/dts/am335x-igep0033.dtsi @@ -161,7 +161,7 @@ #address-cells = <1>; #size-cells = <1>; - elm_id = <&elm>; + ti,elm-id = <&elm>; /* MTD partition table */ partition@0 { |