Merge branch 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

[linux-2.6] / include / linux / gfp.h

diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 063799ea6be084c6125633c6c9f6e2cc72bd837e..2a7d15bcde4684a8b40a4f7aaf65e2e0177faf39 100644 (file)
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -85,8 +85,10 @@ struct vm_area_struct;
 
 static inline enum zone_type gfp_zone(gfp_t flags)
 {
+#ifdef CONFIG_ZONE_DMA
        if (flags & __GFP_DMA)
                return ZONE_DMA;
+#endif
 #ifdef CONFIG_ZONE_DMA32
        if (flags & __GFP_DMA32)
                return ZONE_DMA32;