diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 02:44:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 02:44:30 -0700 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /ipc | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
| download | talos-op-linux-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.gz talos-op-linux-4a1032faac94ebbf647460ae3e06fc21146eb280.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/compat.c | 1 | ||||
| -rw-r--r-- | ipc/mqueue.c | 1 | ||||
| -rw-r--r-- | ipc/msg.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/ipc/compat.c b/ipc/compat.c index ab76fb0ef844..9dc2c7d3c9e6 100644 --- a/ipc/compat.c +++ b/ipc/compat.c @@ -26,7 +26,6 @@ #include <linux/init.h> #include <linux/msg.h> #include <linux/shm.h> -#include <linux/slab.h> #include <linux/syscalls.h> #include <linux/mutex.h> diff --git a/ipc/mqueue.c b/ipc/mqueue.c index e4e3f04803ca..722b0130aa94 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -32,6 +32,7 @@ #include <linux/nsproxy.h> #include <linux/pid.h> #include <linux/ipc_namespace.h> +#include <linux/slab.h> #include <net/sock.h> #include "util.h" diff --git a/ipc/msg.c b/ipc/msg.c index af42ef8900a6..9547cb7ac313 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -23,7 +23,6 @@ */ #include <linux/capability.h> -#include <linux/slab.h> #include <linux/msg.h> #include <linux/spinlock.h> #include <linux/init.h> |
