diff options
author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2014-10-15 12:39:53 -0400 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2014-10-20 14:53:26 -0400 |
commit | 2de4752d6923d7dcc6e68c23be6a52d5f0896f9d (patch) | |
tree | b56cbce343b0d83b825e09483798951c0cb31ae2 /arch/arm/mach-zynq | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) |
ARM: zynq: Actually remove hotplug.c
Commit 'ARM: zynq: Remove hotplug.c'
(caf86a73eab4132f870e883216850d9eee40b04b) was supposed to remove
hotplug.c - but it didn't. It moved all content from
hotplug.c elsewhere and removed its entry from the Makefile, but missed
to actually remove the whole file. Remove it now.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/mach-zynq')
-rw-r--r-- | arch/arm/mach-zynq/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-zynq/hotplug.c | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile index c85fb3f7d5cd..b03a97eb7501 100644 --- a/arch/arm/mach-zynq/Makefile +++ b/arch/arm/mach-zynq/Makefile | |||
@@ -4,6 +4,4 @@ | |||
4 | 4 | ||
5 | # Common support | 5 | # Common support |
6 | obj-y := common.o slcr.o pm.o | 6 | obj-y := common.o slcr.o pm.o |
7 | CFLAGS_REMOVE_hotplug.o =-march=armv6k | ||
8 | CFLAGS_hotplug.o =-Wa,-march=armv7-a -mcpu=cortex-a9 | ||
9 | obj-$(CONFIG_SMP) += headsmp.o platsmp.o | 7 | obj-$(CONFIG_SMP) += headsmp.o platsmp.o |
diff --git a/arch/arm/mach-zynq/hotplug.c b/arch/arm/mach-zynq/hotplug.c deleted file mode 100644 index b685c89f11e4..000000000000 --- a/arch/arm/mach-zynq/hotplug.c +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2012-2013 Xilinx | ||
3 | * | ||
4 | * based on linux/arch/arm/mach-realview/hotplug.c | ||
5 | * | ||
6 | * Copyright (C) 2002 ARM Ltd. | ||
7 | * All Rights Reserved | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | #include <asm/proc-fns.h> | ||
14 | |||