diff options
| author | Hanjun Guo <hanjun.guo@linaro.org> | 2015-03-24 14:02:52 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-03-26 15:13:08 +0000 |
| commit | 42068cfd652843bdb61c374cf3582c4c0643483b (patch) | |
| tree | 1740195175dbc60a2decee15113c1d640be98467 /drivers/xen | |
| parent | 6933de0ca0b7656db94f67731c8c53c7dcacae3a (diff) | |
| download | linux-stable-42068cfd652843bdb61c374cf3582c4c0643483b.tar.gz linux-stable-42068cfd652843bdb61c374cf3582c4c0643483b.tar.bz2 linux-stable-42068cfd652843bdb61c374cf3582c4c0643483b.zip | |
XEN / ACPI: Make XEN ACPI depend on X86
When ACPI is enabled on ARM64, XEN ACPI will also compiled
into the kernel, but XEN ACPI is x86 dependent, so introduce
CONFIG_XEN_ACPI to make it depend on x86 before XEN ACPI is
functional on ARM64.
CC: Julien Grall <julien.grall@linaro.org>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
CC: David Vrabel <david.vrabel@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/xen/Makefile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index b812462083fc..a31cd29b68a8 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -253,4 +253,8 @@ config XEN_EFI def_bool y depends on X86_64 && EFI +config XEN_ACPI + def_bool y + depends on X86 && ACPI + endmenu diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 2ccd3592d41f..f4622ab1fc3e 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -13,7 +13,7 @@ CFLAGS_efi.o += -fshort-wchar dom0-$(CONFIG_PCI) += pci.o dom0-$(CONFIG_USB_SUPPORT) += dbgp.o -dom0-$(CONFIG_ACPI) += acpi.o $(xen-pad-y) +dom0-$(CONFIG_XEN_ACPI) += acpi.o $(xen-pad-y) xen-pad-$(CONFIG_X86) += xen-acpi-pad.o dom0-$(CONFIG_X86) += pcpu.o obj-$(CONFIG_XEN_DOM0) += $(dom0-y) |