diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 16:24:06 -0400 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 16:24:06 -0400 |
| commit | 67ba37293e938208795d6a3562201bdb0cf43393 (patch) | |
| tree | 3522e949ff19f3809583bfb3fa3973ddf264689d /drivers/xen/Makefile | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
| parent | 5bba6c56dc99ff88f79a79572e29ecf445710878 (diff) | |
Merge commit 'konrad/stable/xen-pcifront-0.8.2' into 2.6.36-rc8-initial-domain-v6
Diffstat (limited to 'drivers/xen/Makefile')
| -rw-r--r-- | drivers/xen/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index fcaf838f54be..b97864551718 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile | |||
| @@ -4,6 +4,7 @@ obj-y += xenbus/ | |||
| 4 | nostackp := $(call cc-option, -fno-stack-protector) | 4 | nostackp := $(call cc-option, -fno-stack-protector) |
| 5 | CFLAGS_features.o := $(nostackp) | 5 | CFLAGS_features.o := $(nostackp) |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_BLOCK) += biomerge.o | ||
| 7 | obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o | 8 | obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o |
| 8 | obj-$(CONFIG_XEN_XENCOMM) += xencomm.o | 9 | obj-$(CONFIG_XEN_XENCOMM) += xencomm.o |
| 9 | obj-$(CONFIG_XEN_BALLOON) += balloon.o | 10 | obj-$(CONFIG_XEN_BALLOON) += balloon.o |