Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux

[linux-block.git] / include / linux / memremap.h

diff --git a/include/linux/memremap.h b/include/linux/memremap.h
index bcaa634139a996160247738d94107ce08485e185..93416196ba64f6b4747ad9f37aaf5a913ff3ac29 100644 (file)
--- a/include/linux/memremap.h
+++ b/include/linux/memremap.h
@@ -26,7 +26,7 @@ struct vmem_altmap {
 unsigned long vmem_altmap_offset(struct vmem_altmap *altmap);
 void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns);
 
-#if defined(CONFIG_SPARSEMEM_VMEMMAP) && defined(CONFIG_ZONE_DEVICE)
+#ifdef CONFIG_ZONE_DEVICE
 struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start);
 #else
 static inline struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start)