diff options
| author |   Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-08 15:07:30 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-08 15:07:30 -0400 |
| commit | 136d9ebff300044865693a57d68fe5905635992a (patch) | |
| tree | 1a336de0e43c499c8b51475cca3afb52b8d1499d /drivers/xen/Makefile | |
| parent | xen: Add module alias to autoload backend drivers (diff) | |
| parent | xen: tmem: self-ballooning and frontswap-selfshrinking (diff) | |
| download | linux-dev-136d9ebff300044865693a57d68fe5905635992a.tar.xz linux-dev-136d9ebff300044865693a57d68fe5905635992a.zip | |
Merge branch 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem into stable/drivers
* 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
xen: tmem: self-ballooning and frontswap-selfshrinking
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 7c1bc0a4d9f4..bc3bf5679f6e 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_BLOCK) += biomerge.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o +obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o |