diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 17:25:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 17:25:46 +0200 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | arm/dt: tegra devicetree support (diff) | |
| parent | dmaengine: imx-sdma: add device tree probe support (diff) | |
| download | linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz linux-6124a4e430b64d1577438c8648c59e996d02e73e.zip | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 7b6985a2e652..b3cc1e062b17 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -45,7 +45,7 @@ #include <net/neighbour.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include <rdma/ib_verbs.h> #include <rdma/ib_pack.h> |