diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/mips/kernel/linux32.c | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/mips/kernel/linux32.c')
| -rw-r--r-- | arch/mips/kernel/linux32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index a39d0597a375..c2dab140dc98 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/time.h> | 15 | #include <linux/time.h> |
| 16 | #include <linux/times.h> | 16 | #include <linux/times.h> |
| 17 | #include <linux/poll.h> | 17 | #include <linux/poll.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/skbuff.h> | 18 | #include <linux/skbuff.h> |
| 20 | #include <linux/filter.h> | 19 | #include <linux/filter.h> |
| 21 | #include <linux/shm.h> | 20 | #include <linux/shm.h> |
| @@ -34,6 +33,7 @@ | |||
| 34 | #include <linux/compat.h> | 33 | #include <linux/compat.h> |
| 35 | #include <linux/vfs.h> | 34 | #include <linux/vfs.h> |
| 36 | #include <linux/ipc.h> | 35 | #include <linux/ipc.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | 37 | ||
| 38 | #include <net/sock.h> | 38 | #include <net/sock.h> |
| 39 | #include <net/scm.h> | 39 | #include <net/scm.h> |