diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-08-30 20:42:49 (GMT) |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-08-30 20:42:49 (GMT) |
| commit | b8297cec2da30d3a5869597dbd7c8280d46a7dba (patch) | |
| tree | f9d59dec3cf856754e26a5a719630669366cb779 /drivers/xen/Makefile | |
| parent | 2f74f972d4cc7d83408ea0c32d424edcb44887bf (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| download | linux-fsl-qoriq-b8297cec2da30d3a5869597dbd7c8280d46a7dba.tar.xz | |
Merge tag 'v3.11-rc5' into for-3.12 branch
For testing purposes I want some nfs and nfsd bugfixes (specifically,
58cd57bfd9db3bc213bf9d6a10920f82095f0114 and previous nfsd patches, and
Trond's 4f3cc4809a98a165a9708b72b47de71643797bbd).
Diffstat (limited to 'drivers/xen/Makefile')
| -rw-r--r-- | drivers/xen/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index eabd0ee..14fe79d 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,9 +1,8 @@ -ifneq ($(CONFIG_ARM),y) -obj-y += manage.o +ifeq ($(filter y, $(CONFIG_ARM) $(CONFIG_ARM64)),) obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif obj-$(CONFIG_X86) += fallback.o -obj-y += grant-table.o features.o events.o balloon.o +obj-y += grant-table.o features.o events.o balloon.o manage.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) |