diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-11 13:15:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-11 13:15:18 +1100 |
| commit | 35dac477820609e7409b486b2b6064ce44173a27 (patch) | |
| tree | 07e3ccb6ade7ce6c07bfb2a757d4484e48c4c997 /drivers/infiniband/core/user_mad.c | |
| parent | a309ba636785509e22212e24797beae1119a4c4a (diff) | |
| parent | 6fcc0ef3af13bcdb603250755b916e423ce4b065 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/firewire/fw-device.c
Diffstat (limited to 'drivers/infiniband/core/user_mad.c')
| -rw-r--r-- | drivers/infiniband/core/user_mad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 9a9d3446c6ed..3aa2db54eae4 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -46,9 +46,9 @@ #include <linux/mutex.h> #include <linux/kref.h> #include <linux/compat.h> +#include <linux/semaphore.h> #include <asm/uaccess.h> -#include <asm/semaphore.h> #include <rdma/ib_mad.h> #include <rdma/ib_user_mad.h> |