ia64/xen-unstable

changeset 12868:81730d462241

[LINUX] CONFIG_XEN_BACKEND=m build properly.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Fri Dec 08 09:35:00 2006 +0000 (2006-12-08)
parents 70a7a4c953b4
children 212511a8f202
files linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile	Fri Dec 08 09:34:24 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile	Fri Dec 08 09:35:00 2006 +0000
     1.3 @@ -1,13 +1,9 @@
     1.4 -obj-y	+= xenbus.o
     1.5 +obj-y += xenbus_client.o xenbus_comms.o xenbus_xs.o xenbus_probe.o
     1.6  obj-$(CONFIG_XEN_BACKEND) += xenbus_be.o
     1.7  
     1.8  xenbus_be-objs =
     1.9  xenbus_be-objs += xenbus_backend_client.o
    1.10  
    1.11 -xenbus-objs =
    1.12 -xenbus-objs += xenbus_client.o
    1.13 -xenbus-objs += xenbus_comms.o
    1.14 -xenbus-objs += xenbus_xs.o
    1.15 -xenbus-objs += xenbus_probe.o
    1.16 -obj-$(CONFIG_XEN_BACKEND) += xenbus_probe_backend.o
    1.17 +xenbus-$(CONFIG_XEN_BACKEND) += xenbus_probe_backend.o
    1.18 +obj-y += $(xenbus-y) $(xenbus-m)
    1.19  obj-$(CONFIG_XEN_XENBUS_DEV) += xenbus_dev.o
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.h	Fri Dec 08 09:34:24 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.h	Fri Dec 08 09:35:00 2006 +0000
     2.3 @@ -34,7 +34,7 @@
     2.4  #ifndef _XENBUS_PROBE_H
     2.5  #define _XENBUS_PROBE_H
     2.6  
     2.7 -#ifdef CONFIG_XEN_BACKEND
     2.8 +#if defined(CONFIG_XEN_BACKEND) || defined(CONFIG_XEN_BACKEND_MODULE)
     2.9  extern void xenbus_backend_suspend(int (*fn)(struct device *, void *));
    2.10  extern void xenbus_backend_resume(int (*fn)(struct device *, void *));
    2.11  extern void xenbus_backend_probe_and_watch(void);