projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx5
/
core
/
main.c
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/main.c
b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 2388aec208fa92fc56da476882b51fd6d0d2b6d9..4ac8d4cc49737da1d19707203aa479b832c4190a 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/main.c
@@
-30,7
+30,7
@@
* SOFTWARE.
*/
-#include <
asm-generic/kmap_types
.h>
+#include <
linux/highmem
.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>