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 branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
vexpress_defconfig
diff --git
a/arch/arm/configs/vexpress_defconfig
b/arch/arm/configs/vexpress_defconfig
index 37fe607a4ede57755a112da4f17fdd8d4ae44f8a..0fa0ed577b1551b5776b5b3599c6d1ed24cc9eee 100644
(file)
--- a/
arch/arm/configs/vexpress_defconfig
+++ b/
arch/arm/configs/vexpress_defconfig
@@
-46,7
+46,6
@@
CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
-# CONFIG_INET_LRO is not set
# CONFIG_IPV6 is not set
# CONFIG_WIRELESS is not set
CONFIG_NET_9P=y