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
2010-04-07 08:38:27 -07:00 · 2010-04-07 08:38:27 -07:00 · 6948ec7035
parent cc4fc29e59 18e5b539b4
commit 6948ec7035
1 changed files with 1 additions and 1 deletions
--- 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[];