Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git…

…/tj/misc * 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc: nodemask: include slab.h from drivers/base/node.c
git-mirror · Apr 7, 2010 · 6948ec7 · 6948ec7
2 parents cc4fc29 + 18e5b53
commit 6948ec7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/base/node.c b/drivers/base/node.c
@@ -15,7 +15,7 @@
 #include <linux/cpu.h>
 #include <linux/device.h>
 #include <linux/swap.h>
-#include <linux/gfp.h>
+#include <linux/slab.h>
 
 static struct sysdev_class_attribute *node_state_attrs[];