diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 11:38:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 11:38:27 -0400 |
| commit | 6948ec70355ae6cf6082519e3d76b280373dade1 (patch) | |
| tree | 5fa9bba0397d70958ec58a5d547dc8f7f06b9f9d /drivers | |
| parent | cc4fc29e59c386919a7674e203be7822dc968dc0 (diff) | |
| parent | 18e5b539b451158be7aae6c390a20f0d3e5b9213 (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
Diffstat (limited to 'drivers')
| -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 @@ | |||
| 15 | #include <linux/cpu.h> | 15 | #include <linux/cpu.h> |
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/swap.h> | 17 | #include <linux/swap.h> |
| 18 | #include <linux/gfp.h> | 18 | #include <linux/slab.h> |
| 19 | 19 | ||
| 20 | static struct sysdev_class_attribute *node_state_attrs[]; | 20 | static struct sysdev_class_attribute *node_state_attrs[]; |
| 21 | 21 | ||