diff --git a/[refs] b/[refs] index b1571751cab5..f6e88b81f516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba04c289bc9bae0f381797f58615c7b3989c5e8c +refs/heads/master: 2f32b1faa8c75e2e987c5b714ae25491d8477da5 diff --git a/trunk/arch/arm/boot/dts/tegra-seaboard.dts b/trunk/arch/arm/boot/dts/tegra-seaboard.dts index ea93332ef9a0..c935a2871846 100644 --- a/trunk/arch/arm/boot/dts/tegra-seaboard.dts +++ b/trunk/arch/arm/boot/dts/tegra-seaboard.dts @@ -7,7 +7,6 @@ compatible = "nvidia,seaboard", "nvidia,tegra20"; memory { - device_type = "memory"; reg = <0x00000000 0x40000000>; };