From 0b12d32412fea72c2868c14c7111d0c9d6069c96 Mon Sep 17 00:00:00 2001 From: Joseph Lo Date: Mon, 8 Oct 2012 00:23:57 +0000 Subject: [PATCH] --- yaml --- r: 340053 b: refs/heads/master c: 641b4ef8f1fea88803cc1ff3f34d93ba6bcd8106 h: refs/heads/master i: 340051: 3a2cb45a13f769dfe9504a440ba40e62670e6a69 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/Makefile | 3 +-- trunk/arch/arm/mach-tegra/{sleep-t20.S => sleep-tegra20.S} | 0 trunk/arch/arm/mach-tegra/{sleep-t30.S => sleep-tegra30.S} | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename trunk/arch/arm/mach-tegra/{sleep-t20.S => sleep-tegra20.S} (100%) rename trunk/arch/arm/mach-tegra/{sleep-t30.S => sleep-tegra30.S} (100%) diff --git a/[refs] b/[refs] index ece68543b8a7..40716114911d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5db9a44229058ddfe4773aaefa5a465344d7b10 +refs/heads/master: 641b4ef8f1fea88803cc1ff3f34d93ba6bcd8106 diff --git a/trunk/arch/arm/mach-tegra/Makefile b/trunk/arch/arm/mach-tegra/Makefile index 6cc23cc83509..dcd4726ebbae 100644 --- a/trunk/arch/arm/mach-tegra/Makefile +++ b/trunk/arch/arm/mach-tegra/Makefile @@ -14,11 +14,10 @@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_clocks.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_clocks_data.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_speedo.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o -obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += sleep-t20.o +obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += sleep-tegra20.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks_data.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_speedo.o -obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += sleep-t30.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_SMP) += reset.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff --git a/trunk/arch/arm/mach-tegra/sleep-t20.S b/trunk/arch/arm/mach-tegra/sleep-tegra20.S similarity index 100% rename from trunk/arch/arm/mach-tegra/sleep-t20.S rename to trunk/arch/arm/mach-tegra/sleep-tegra20.S diff --git a/trunk/arch/arm/mach-tegra/sleep-t30.S b/trunk/arch/arm/mach-tegra/sleep-tegra30.S similarity index 100% rename from trunk/arch/arm/mach-tegra/sleep-t30.S rename to trunk/arch/arm/mach-tegra/sleep-tegra30.S