git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-5.2-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/power...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
skiroot_defconfig
diff --git
a/arch/powerpc/configs/skiroot_defconfig
b/arch/powerpc/configs/skiroot_defconfig
index 1bcd468ab422dc100b120607b03d5d587850b453..a887616e35a25f3ef8a0c0821ff19bdde649fa12 100644
(file)
--- a/
arch/powerpc/configs/skiroot_defconfig
+++ b/
arch/powerpc/configs/skiroot_defconfig
@@
-163,6
+163,8
@@
CONFIG_S2IO=m
CONFIG_MLX4_EN=m
# CONFIG_MLX4_CORE_GEN2 is not set
CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+# CONFIG_MLX5_EN_RXNFC is not set
# CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
CONFIG_MYRI10GE=m