Arnd Bergmann 4c9e0f76a5 ARM: 8370/1: hisi: fix hip04 build without HOTPLUG_CPU ... The hip04 smp implementation provides the hotplug operations (cpu_die and cpu_kill) unconditionally at the moment, which leads to a build error when HOTPLUG_CPU is disabled: mach-hisi/platmcpm.c:242:13: note: (near initialization for 'hip04_smp_ops') mach-hisi/platmcpm.c:242:2: error: unknown field 'cpu_die' specified in initializer mach-hisi/platmcpm.c:243:2: error: unknown field 'cpu_kill' specified in initializer This uses an #ifdef to remove the code from the build when that option is not set. Fixes: 905cdf9dda ("ARM: hisi/hip04: remove the MCPM overhead") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Nicolas Pitre <nico@xxxxxxxxxx> Acked-by: Wei Xu <xuwei5@hisilicon.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2015-05-28 00:22:49 +01:00
..
boot	Merge git://www.linux-watchdog.org/linux-watchdog	2015-04-22 11:22:55 -07:00
common	ARM: MCPM: remove residency argument from mcpm_cpu_suspend()	2015-05-06 11:47:10 -04:00
configs	ARM: SoC defconfig updates for v4.1	2015-04-22 09:21:30 -07:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-04-15 10:42:15 -07:00
firmware
include	ARM: MCPM: remove residency argument from mcpm_cpu_suspend()	2015-05-06 11:47:10 -04:00
kernel	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-04-24 08:10:53 -07:00
kvm	This mostly includes the PPC changes for 4.1, which this time cover	2015-04-26 13:06:22 -07:00
lib	ARM: ensure delay timer has sufficient accuracy for delays	2015-04-14 22:28:07 +01:00
mach-alpine	ARM: alpine: add support for generic pci	2015-04-14 01:15:57 +02:00
mach-asm9260
mach-at91	Fourth batch of cleanup for 4.1:	2015-04-14 01:50:21 +02:00
mach-axxia
mach-bcm
mach-berlin
mach-clps711x
mach-cns3xxx
mach-davinci	ARM: DT updates for v4.1	2015-04-22 09:09:46 -07:00
mach-digicolor
mach-dove
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos	ARM: MCPM: remove residency argument from mcpm_cpu_suspend()	2015-05-06 11:47:10 -04:00
mach-footbridge
mach-gemini
mach-highbank
mach-hisi	ARM: 8370/1: hisi: fix hip04 build without HOTPLUG_CPU	2015-05-28 00:22:49 +01:00
mach-imx	ARM: SoC late changes for v4.1	2015-04-22 09:24:55 -07:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone
mach-ks8695
mach-lpc32xx
mach-mediatek
mach-meson
mach-mmp
mach-moxart
mach-mv78xx0
mach-mvebu	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00
mach-mxs
mach-netx
mach-nomadik
mach-nspire
mach-omap1
mach-omap2	ARM: SoC late changes for v4.1	2015-04-22 09:24:55 -07:00
mach-orion5x
mach-picoxcell
mach-prima2
mach-pxa	power supply and reset changes for the v4.1 series	2015-04-13 15:21:34 -07:00
mach-qcom
mach-realview
mach-rockchip
mach-rpc
mach-s3c24xx
mach-s3c64xx	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00
mach-s5pv210
mach-sa1100
mach-shmobile	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-04-24 09:49:37 -07:00
mach-socfpga
mach-spear
mach-sti
mach-sunxi
mach-tegra	Power management and ACPI updates for v4.1-rc1	2015-04-14 20:21:54 -07:00
mach-u300
mach-ux500
mach-versatile
mach-vexpress	ARM: SoC driver updates for v4.1	2015-04-22 09:18:17 -07:00
mach-vt8500
mach-w90x900
mach-zynq
mm	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-04-24 08:10:53 -07:00
net
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa	ARM: plat-pxa: remove use of seq_printf return value	2015-04-15 16:35:25 -07:00
plat-samsung
plat-versatile
probes
tools
vdso	ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile	2015-04-21 15:28:02 +01:00
vfp
xen
Kconfig	ARM: SoC multiplatform code changes for v4.1	2015-04-22 09:20:15 -07:00
Kconfig-nommu
Kconfig.debug	ARM: SoC multiplatform code changes for v4.1	2015-04-22 09:20:15 -07:00
Makefile	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00