Merge tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / xen / Kconfig

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index ed6a8099666d1b2e73fdd9f29ac395bdc261e5d6..f03bf501527f64785a3fbbec39963f979d70ad8a 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -145,9 +145,9 @@ config SWIOTLB_XEN
        select SWIOTLB
 
 config XEN_TMEM
-       bool
+       tristate
        depends on !ARM
-       default y if (CLEANCACHE || FRONTSWAP)
+       default m if (CLEANCACHE || FRONTSWAP)
        help
          Shim to interface in-kernel Transcendent Memory hooks
          (e.g. cleancache and frontswap) to Xen tmem hypercalls.