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 | |
| 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')
| -rw-r--r-- | drivers/infiniband/core/user_mad.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/amso1100/c2.h | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_dev.h | 3 | ||||
| -rw-r--r-- | drivers/infiniband/hw/nes/nes.h | 1 |
4 files changed, 2 insertions, 5 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> diff --git a/drivers/infiniband/hw/amso1100/c2.h b/drivers/infiniband/hw/amso1100/c2.h index 21bcb3ada7fe..1944920a1be7 100644 --- a/drivers/infiniband/hw/amso1100/c2.h +++ b/drivers/infiniband/hw/amso1100/c2.h @@ -40,7 +40,6 @@ #include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/idr.h> -#include <asm/semaphore.h> #include "c2_provider.h" #include "c2_mq.h" diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h index f82ed832ad97..b5a99e311f6c 100644 --- a/drivers/infiniband/hw/mthca/mthca_dev.h +++ b/drivers/infiniband/hw/mthca/mthca_dev.h @@ -46,8 +46,7 @@ #include <linux/timer.h> #include <linux/mutex.h> #include <linux/list.h> - -#include <asm/semaphore.h> +#include <linux/semaphore.h> #include "mthca_provider.h" #include "mthca_doorbell.h" diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h index 5498b747233c..ea9a22249489 100644 --- a/drivers/infiniband/hw/nes/nes.h +++ b/drivers/infiniband/hw/nes/nes.h @@ -43,7 +43,6 @@ #include <linux/dma-mapping.h> #include <linux/workqueue.h> #include <linux/slab.h> -#include <asm/semaphore.h> #include <linux/version.h> #include <asm/io.h> #include <linux/crc32c.h> |