summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 08:38:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 08:38:27 -0700
commit6948ec70355ae6cf6082519e3d76b280373dade1 (patch)
tree5fa9bba0397d70958ec58a5d547dc8f7f06b9f9d
parentcc4fc29e59c386919a7674e203be7822dc968dc0 (diff)
parent18e5b539b451158be7aae6c390a20f0d3e5b9213 (diff)
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
-rw-r--r--drivers/base/node.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 985abd7f49a..057979a19ee 100644
--- 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[];