diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 17:22:22 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 17:26:41 +1100 |
| commit | ef9ea503472da2992fcde8954ec3445d450d2781 (patch) | |
| tree | d2ed39ac34f23090ae7cd8819bfc82d238d62d17 /drivers/infiniband/hw/nes | |
| parent | fb260b23c0a9225c93e8892280c6d73797a3cecc (diff) | |
| parent | 8b2fe80f5a68b2ebcb0d83f09b94e0890fd8e0b5 (diff) | |
Merge remote branch 'slabh/slabh'
Conflicts:
drivers/char/sysrq.c
drivers/gpu/drm/radeon/r300.c
drivers/hid/hid-wacom.c
drivers/media/video/soc_camera.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
drivers/pcmcia/pcmcia_resource.c
drivers/s390/char/vmcp.c
drivers/staging/cx25821/cx25821-audio-upstream.c
fs/9p/vfs_super.c
include/linux/percpu.h
kernel/audit_watch.c
net/mac80211/scan.c
sound/soc/codecs/ad1938.c
Diffstat (limited to 'drivers/infiniband/hw/nes')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_cm.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_utils.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.c | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 4272c52e38a4..de7b9d7166f3 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c @@ -44,6 +44,7 @@ #include <linux/init.h> #include <linux/if_arp.h> #include <linux/highmem.h> +#include <linux/slab.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/byteorder.h> diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c index 2a49ee40b520..986d6f32dded 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c @@ -53,6 +53,7 @@ #include <linux/list.h> #include <linux/threads.h> #include <linux/highmem.h> +#include <linux/slab.h> #include <net/arp.h> #include <net/neighbour.h> #include <net/route.h> diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 925075557dc2..c36a3f514929 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c @@ -39,6 +39,7 @@ #include <linux/tcp.h> #include <linux/if_vlan.h> #include <linux/inet_lro.h> +#include <linux/slab.h> #include "nes.h" diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 91fdde382e82..b7c813f4be43 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c @@ -40,6 +40,7 @@ #include <linux/if_arp.h> #include <linux/if_vlan.h> #include <linux/ethtool.h> +#include <linux/slab.h> #include <net/tcp.h> #include <net/inet_common.h> diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c index 729d525c5b70..186623d86959 100644 --- a/drivers/infiniband/hw/nes/nes_utils.c +++ b/drivers/infiniband/hw/nes/nes_utils.c @@ -38,6 +38,7 @@ #include <linux/ethtool.h> #include <linux/mii.h> #include <linux/if_vlan.h> +#include <linux/slab.h> #include <linux/crc32.h> #include <linux/in.h> #include <linux/ip.h> diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 69928296d74b..5a076e8f116a 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -35,6 +35,7 @@ #include <linux/moduleparam.h> #include <linux/random.h> #include <linux/highmem.h> +#include <linux/slab.h> #include <asm/byteorder.h> #include <rdma/ib_verbs.h> |