diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 06:46:20 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 06:46:20 +0200 |
| commit | 6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (patch) | |
| tree | 05aff14f02776bc0d59a1f777cb92df6f4456ba9 /drivers/net/cxgb3/t3cdev.h | |
| parent | Input: wacom - revert "Cintiq 21UX2 does not have menu strips" (diff) | |
| parent | Input: adp5589-keys - add support for the ADP5585 derivatives (diff) | |
| download | linux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.tar.xz linux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/net/cxgb3/t3cdev.h')
| -rw-r--r-- | drivers/net/cxgb3/t3cdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h index be55e9ae74d1..705713b56636 100644 --- a/drivers/net/cxgb3/t3cdev.h +++ b/drivers/net/cxgb3/t3cdev.h @@ -33,7 +33,7 @@ #define _T3CDEV_H_ #include <linux/list.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include <linux/netdevice.h> #include <linux/proc_fs.h> #include <linux/skbuff.h> |