diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
| commit | 871039f02f8ec4ab2e5e9010718caa8e085786f1 (patch) | |
| tree | f0d2b3127fc48c862967d68c46c2d46668137515 /arch/mips/kernel/linux32.c | |
| parent | e4077e018b5ead3de9951fc01d8bf12eeeeeefed (diff) | |
| parent | 4a1032faac94ebbf647460ae3e06fc21146eb280 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
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> |