diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 15:10:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 15:10:12 -0400 |
| commit | 6c9fcaf2eec1b9f85226a694230dd957dd7926b3 (patch) | |
| tree | f8c824c6c64dc411752c844f116e693760768bcc /drivers | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
| parent | 199a952876adbfc2b6c13b8b07adabebf4ff54b2 (diff) | |
Merge branch 'core/rcu' into core/rcu-for-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_verbs.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 3 | ||||
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c index 9e23ab0b51a1..55c718828826 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.c +++ b/drivers/infiniband/hw/ipath/ipath_verbs.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <rdma/ib_user_verbs.h> | 35 | #include <rdma/ib_user_verbs.h> |
| 36 | #include <linux/io.h> | 36 | #include <linux/io.h> |
| 37 | #include <linux/utsname.h> | 37 | #include <linux/utsname.h> |
| 38 | #include <linux/rculist.h> | ||
| 38 | 39 | ||
| 39 | #include "ipath_kernel.h" | 40 | #include "ipath_kernel.h" |
| 40 | #include "ipath_verbs.h" | 41 | #include "ipath_verbs.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c index 9e5abf9c309d..d73e32232879 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c +++ b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | |||
| @@ -31,8 +31,7 @@ | |||
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/list.h> | 34 | #include <linux/rculist.h> |
| 35 | #include <linux/rcupdate.h> | ||
| 36 | 35 | ||
| 37 | #include "ipath_verbs.h" | 36 | #include "ipath_verbs.h" |
| 38 | 37 | ||
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index c36a03ae9bfb..860d75d81f82 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 23 | #include <linux/list.h> | 23 | #include <linux/rculist.h> |
| 24 | #include <linux/notifier.h> | 24 | #include <linux/notifier.h> |
| 25 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
| 26 | #include <linux/etherdevice.h> | 26 | #include <linux/etherdevice.h> |