aboutsummaryrefslogtreecommitdiffstats
path: root/unmodified_drivers/linux-2.6/balloon
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-11-24 11:11:20 +0000
committerKeir Fraser <keir.fraser@citrix.com>2008-11-24 11:11:20 +0000
commitc65b3f8832a25e0730a6790553037120580cfa72 (patch)
treeeb162a8fbbff40ed374a5d6d0cc5ef1396360374 /unmodified_drivers/linux-2.6/balloon
parent71a732a2b8ea47cf97510bdce0508917769e3ee0 (diff)
downloadxen-c65b3f8832a25e0730a6790553037120580cfa72.tar.gz
xen-c65b3f8832a25e0730a6790553037120580cfa72.tar.bz2
xen-c65b3f8832a25e0730a6790553037120580cfa72.zip
pv-on-hvm drivers: build fixes for Linux 2.6.27+
Make the drivers build properly in a 2.6.27 environment as well as against a kernel with pv-ops Xen configured on (in the latter case more work would be needed to also make the drivers work, as there's a large number of duplicate exports). Portions from Charles Arnold <carnold@novell.com>. Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'unmodified_drivers/linux-2.6/balloon')
-rw-r--r--unmodified_drivers/linux-2.6/balloon/Kbuild5
1 files changed, 2 insertions, 3 deletions
diff --git a/unmodified_drivers/linux-2.6/balloon/Kbuild b/unmodified_drivers/linux-2.6/balloon/Kbuild
index bcc8b05207..316592d83a 100644
--- a/unmodified_drivers/linux-2.6/balloon/Kbuild
+++ b/unmodified_drivers/linux-2.6/balloon/Kbuild
@@ -4,6 +4,5 @@ obj-m = xen-balloon.o
EXTRA_CFLAGS += -I$(M)/platform-pci
-xen-balloon-objs =
-xen-balloon-objs += balloon.o
-xen-balloon-objs += sysfs.o
+xen-balloon-y := balloon.o sysfs.o
+xen-balloon-$(CONFIG_XEN_SCRUB_PAGES) += scrub.o