From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 8 May 2013 19:16:23 +0000 (-0400)
Subject: xen/tmem: Cleanup. Remove the parts that say temporary.
X-Git-Tag: v3.10-rc2~1^2~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a5e9cd952e2ee215286ea3ec5e6b3aa669e04e0e;p=linux-block.git

xen/tmem: Cleanup. Remove the parts that say temporary.

Frontswap is upstream, no need to having this #ifdef.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index e3600be4e7fa..5686d6d1a4b5 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -11,11 +11,7 @@
 #include <linux/init.h>
 #include <linux/pagemap.h>
 #include <linux/cleancache.h>
-
-/* temporary ifdef until include/linux/frontswap.h is upstream */
-#ifdef CONFIG_FRONTSWAP
 #include <linux/frontswap.h>
-#endif
 
 #include <xen/xen.h>
 #include <xen/interface/xen.h>