diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/armv7/tegra-common/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra-common/power.c (renamed from arch/arm/cpu/armv7/tegra2/power.c) | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-tegra/power.h (renamed from arch/arm/include/asm/arch-tegra2/power.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/tegra-common/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile index 577a342694d..226d1904471 100644 --- a/arch/arm/cpu/armv7/tegra-common/Makefile +++ b/arch/arm/cpu/armv7/tegra-common/Makefile @@ -31,7 +31,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)libtegra-common.o SOBJS-y := lowlevel_init.o -COBJS-y := ap20.o board.o clock.o timer.o +COBJS-y := ap20.o board.o clock.o power.o timer.o SOBJS := $(SOBJS-y) COBJS := $(COBJS-y) diff --git a/arch/arm/cpu/armv7/tegra2/power.c b/arch/arm/cpu/armv7/tegra-common/power.c index 1ae53c7fff7..d337bf09550 100644 --- a/arch/arm/cpu/armv7/tegra2/power.c +++ b/arch/arm/cpu/armv7/tegra-common/power.c @@ -25,7 +25,7 @@ #include <asm/arch-tegra/bitfield.h> #include <asm/arch/clock.h> #include <asm/arch-tegra/pmc.h> -#include <asm/arch/power.h> +#include <asm/arch-tegra/power.h> #include <asm/arch/tegra.h> #include <common.h> diff --git a/arch/arm/cpu/armv7/tegra2/Makefile b/arch/arm/cpu/armv7/tegra2/Makefile index 4e0b22f4a68..ff2168483d4 100644 --- a/arch/arm/cpu/armv7/tegra2/Makefile +++ b/arch/arm/cpu/armv7/tegra2/Makefile @@ -33,7 +33,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o SOBJS-y := -COBJS-y := board.o display.o pinmux.o power.o pwfm.o sys_info.o +COBJS-y := board.o display.o pinmux.o pwfm.o sys_info.o COBJS-$(CONFIG_TEGRA2_LP0) += warmboot.o COBJS-$(CONFIG_TEGRA2_LP0) += warmboot_avp.o diff --git a/arch/arm/include/asm/arch-tegra2/power.h b/arch/arm/include/asm/arch-tegra/power.h index 9d168ebe2f2..9d168ebe2f2 100644 --- a/arch/arm/include/asm/arch-tegra2/power.h +++ b/arch/arm/include/asm/arch-tegra/power.h |