Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d266069 authored Dec 04, 2014 by Arnd Bergmann

Merge tag 'zynq-cleanup-for-3.19' of https://github.com/Xilinx/linux-xlnx into next/cleanup

Pull "arm: Xilinx Zynq cleanup patches for v3.19" from Michal Simek:

- Remove unused file and declaration

* tag 'zynq-cleanup-for-3.19' of https://github.com/Xilinx/linux-xlnx

:
  ARM: zynq: Remove secondary_startup() declaration from header
  ARM: zynq: Actually remove hotplug.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 1f1dd588 2b175186

arch/arm/mach-zynq/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -4,6 +4,4 @@

		# Common support
		obj-y := common.o slcr.o pm.o
		CFLAGS_REMOVE_hotplug.o =-march=armv6k
		CFLAGS_hotplug.o =-Wa,-march=armv7-a -mcpu=cortex-a9
		obj-$(CONFIG_SMP) += headsmp.o platsmp.o

arch/arm/mach-zynq/common.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ extern void zynq_slcr_cpu_state_write(int cpu, bool die);
		extern u32 zynq_slcr_get_device_id(void);

		#ifdef CONFIG_SMP
		extern void secondary_startup(void);
		extern char zynq_secondary_trampoline;
		extern char zynq_secondary_trampoline_jump;
		extern char zynq_secondary_trampoline_end;

arch/arm/mach-zynq/hotplug.c

deleted100644 → 0

+0 −14

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012-2013 Xilinx
		*
		* based on linux/arch/arm/mach-realview/hotplug.c
		*
		* Copyright (C) 2002 ARM Ltd.
		* All Rights Reserved
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#include <asm/proc-fns.h>