aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-04-01 10:37:36 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-04-01 10:37:36 +0100
commit17e838d026118840e044a1fd2799671fe02915e5 (patch)
treec98db0d1cc93b97fddf0537356a264b2671ec2c5
parent5a3908ddfd454561546ddf9be0bf9f03ed276578 (diff)
downloadxen-17e838d026118840e044a1fd2799671fe02915e5.tar.gz
xen-17e838d026118840e044a1fd2799671fe02915e5.tar.bz2
xen-17e838d026118840e044a1fd2799671fe02915e5.zip
[IA64] Include features header in xenbus_probe and build features.c
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
-rw-r--r--linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile2
-rw-r--r--linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile
index 7a35e75b42..a2d0f650bd 100644
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile
@@ -10,7 +10,7 @@ $(obj)/vmlinux.lds.S:
@ln -fsn $(srctree)/arch/$(XENARCH)/kernel/vmlinux.lds.S $@
-obj-y := gnttab.o
+obj-y := gnttab.o features.o
obj-$(CONFIG_PROC_FS) += xen_proc.o
ifeq ($(ARCH),ia64)
diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index 935ec0a5eb..db1492d050 100644
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -49,6 +49,7 @@
#include <xen/xenbus.h>
#include <xen/xen_proc.h>
#include <xen/evtchn.h>
+#include <xen/features.h>
#include "xenbus_comms.h"