diff --git a/[refs] b/[refs] index 8164c82d2359..d3a786344903 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61077b2c50476ac85ced8a56fc6b5aaa3aa9c980 +refs/heads/master: 65d4b248114e18b3d805c7ecb88d9ea64dd978e4 diff --git a/trunk/drivers/xen/Kconfig b/trunk/drivers/xen/Kconfig index f815283667af..5f7ff8e2fc14 100644 --- a/trunk/drivers/xen/Kconfig +++ b/trunk/drivers/xen/Kconfig @@ -11,7 +11,7 @@ config XEN_BALLOON config XEN_SELFBALLOONING bool "Dynamically self-balloon kernel memory to target" - depends on XEN && XEN_BALLOON && CLEANCACHE && SWAP + depends on XEN && XEN_BALLOON && CLEANCACHE && SWAP && XEN_TMEM default n help Self-ballooning dynamically balloons available kernel memory driven