projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus
[cascardo/linux.git]
/
include
/
linux
/
mlx4
/
driver.h
diff --git
a/include/linux/mlx4/driver.h
b/include/linux/mlx4/driver.h
index
d813704
..
c257e1b
100644
(file)
--- a/
include/linux/mlx4/driver.h
+++ b/
include/linux/mlx4/driver.h
@@
-45,6
+45,8
@@
enum mlx4_dev_event {
MLX4_DEV_EVENT_PORT_DOWN,
MLX4_DEV_EVENT_PORT_REINIT,
MLX4_DEV_EVENT_PORT_MGMT_CHANGE,
+ MLX4_DEV_EVENT_SLAVE_INIT,
+ MLX4_DEV_EVENT_SLAVE_SHUTDOWN,
};
struct mlx4_interface {