diff --git a/[refs] b/[refs] index 39bdc8e19816..6cc9e2080952 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0336553e4a8c1fefc11aa5656cebf2ce80657322 +refs/heads/master: 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6 diff --git a/trunk/arch/arm/boot/dts/tegra-harmony.dts b/trunk/arch/arm/boot/dts/tegra20-harmony.dts similarity index 100% rename from trunk/arch/arm/boot/dts/tegra-harmony.dts rename to trunk/arch/arm/boot/dts/tegra20-harmony.dts diff --git a/trunk/arch/arm/boot/dts/tegra-paz00.dts b/trunk/arch/arm/boot/dts/tegra20-paz00.dts similarity index 100% rename from trunk/arch/arm/boot/dts/tegra-paz00.dts rename to trunk/arch/arm/boot/dts/tegra20-paz00.dts diff --git a/trunk/arch/arm/boot/dts/tegra-seaboard.dts b/trunk/arch/arm/boot/dts/tegra20-seaboard.dts similarity index 100% rename from trunk/arch/arm/boot/dts/tegra-seaboard.dts rename to trunk/arch/arm/boot/dts/tegra20-seaboard.dts diff --git a/trunk/arch/arm/boot/dts/tegra-trimslice.dts b/trunk/arch/arm/boot/dts/tegra20-trimslice.dts similarity index 100% rename from trunk/arch/arm/boot/dts/tegra-trimslice.dts rename to trunk/arch/arm/boot/dts/tegra20-trimslice.dts diff --git a/trunk/arch/arm/boot/dts/tegra-ventana.dts b/trunk/arch/arm/boot/dts/tegra20-ventana.dts similarity index 100% rename from trunk/arch/arm/boot/dts/tegra-ventana.dts rename to trunk/arch/arm/boot/dts/tegra20-ventana.dts diff --git a/trunk/arch/arm/boot/dts/tegra-cardhu.dts b/trunk/arch/arm/boot/dts/tegra30-cardhu.dts similarity index 100% rename from trunk/arch/arm/boot/dts/tegra-cardhu.dts rename to trunk/arch/arm/boot/dts/tegra30-cardhu.dts diff --git a/trunk/arch/arm/mach-tegra/Makefile.boot b/trunk/arch/arm/mach-tegra/Makefile.boot index 9a82094092d7..8040345bd971 100644 --- a/trunk/arch/arm/mach-tegra/Makefile.boot +++ b/trunk/arch/arm/mach-tegra/Makefile.boot @@ -2,9 +2,9 @@ zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) += 0x00008000 params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100 initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000 -dtb-$(CONFIG_MACH_HARMONY) += tegra-harmony.dtb -dtb-$(CONFIG_MACH_PAZ00) += tegra-paz00.dtb -dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb -dtb-$(CONFIG_MACH_TRIMSLICE) += tegra-trimslice.dtb -dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb -dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra-cardhu.dtb +dtb-$(CONFIG_MACH_HARMONY) += tegra20-harmony.dtb +dtb-$(CONFIG_MACH_PAZ00) += tegra20-paz00.dtb +dtb-$(CONFIG_MACH_SEABOARD) += tegra20-seaboard.dtb +dtb-$(CONFIG_MACH_TRIMSLICE) += tegra20-trimslice.dtb +dtb-$(CONFIG_MACH_VENTANA) += tegra20-ventana.dtb +dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-cardhu.dtb