Signed-off-by: Ian Campbell<ian.campbell@xxxxxxxxxx>
Cc: Jeremy Fitzhardinge<jeremy@xxxxxxxx>
---
  drivers/xen/Kconfig  |    2 +-
  drivers/xen/Makefile |    7 +++++--
  2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 22c8818..a2833bb 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -169,7 +169,7 @@ config XEN_S3
         depends on XEN_DOM0&&  ACPI
  config XEN_GNTDEV
-       bool "userspace grant access device driver"
+       tristate "userspace grant access device driver"
        depends on XEN
        select MMU_NOTIFIER
        help
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index f7893f3..3288930 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -8,8 +8,8 @@ obj-$(CONFIG_PCI)                       += pci.o
  obj-$(CONFIG_HOTPLUG_CPU)             += cpu_hotplug.o
  obj-$(CONFIG_XEN_XENCOMM)             += xencomm.o
  obj-$(CONFIG_XEN_BALLOON)             += balloon.o
-obj-$(CONFIG_XEN_DEV_EVTCHN)           += evtchn.o
-obj-$(CONFIG_XEN_GNTDEV)               += gntdev.o
+obj-$(CONFIG_XEN_DEV_EVTCHN)           += xen-evtchn.o
+obj-$(CONFIG_XEN_GNTDEV)               += xen-gntdev.o
  obj-$(CONFIG_XEN_BLKDEV_BACKEND)      += blkback/
  obj-$(CONFIG_XEN_BLKDEV_TAP)            += blktap/
  obj-$(CONFIG_XEN_NETDEV_BACKEND)      += netback/
@@ -19,3 +19,6 @@ obj-$(CONFIG_XEN_SYS_HYPERVISOR)      += sys-hypervisor.o
  obj-$(CONFIG_XEN_S3)                  += acpi.o
  obj-$(CONFIG_XEN_MCE)                 += mce.o
  obj-$(CONFIG_ACPI_PROCESSOR_XEN)      += acpi_processor.o
+
+xen-evtchn-y                           := evtchn.o
+xen-gntdev-y                           := gntdev.o