summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2015-10-23 10:50:47 -0600
committerTom Warren <twarren@nvidia.com>2015-11-12 09:21:06 -0700
commitaae52c000f9b778248e8fa5d63cf1ad125b48a06 (patch)
tree47906a783e0a14f04fa0d8fff5af73468b678b60
parent019bc6259d4f096219cfe1b9e91fe033b62ae645 (diff)
ARM: tegra: rename dummy XUSB padctl implementation
A future patch will soon move some of the XUSB padctl code into a common file in arch/arm/mach-tegra. Rename the existing dummy XUSB padctl file to avoid conflicting with that, or being confusing. Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/Makefile2
-rw-r--r--arch/arm/mach-tegra/xusb-padctl-dummy.c (renamed from arch/arm/mach-tegra/xusb-padctl.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 98431a91f8..2be6ef41ff 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -23,7 +23,7 @@ obj-y += clock.o
obj-y += lowlevel_init.o
obj-y += pinmux-common.o
obj-y += powergate.o
-obj-y += xusb-padctl.o
+obj-y += xusb-padctl-dummy.o
obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o
obj-$(CONFIG_TEGRA_GPU) += gpu.o
obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
diff --git a/arch/arm/mach-tegra/xusb-padctl.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c
index 65f8d2ea96..65f8d2ea96 100644
--- a/arch/arm/mach-tegra/xusb-padctl.c
+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c