diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 08:38:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 08:38:27 -0700 |
| commit | 6948ec70355ae6cf6082519e3d76b280373dade1 (patch) | |
| tree | 5fa9bba0397d70958ec58a5d547dc8f7f06b9f9d | |
| parent | cc4fc29e59c386919a7674e203be7822dc968dc0 (diff) | |
| parent | 18e5b539b451158be7aae6c390a20f0d3e5b9213 (diff) | |
| download | linux-6948ec70355ae6cf6082519e3d76b280373dade1.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 985abd7f49a7..057979a19eea 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[]; |