git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert back to .14
[linux-2.6.git]
/
planetlab-2.6.27-i686.config
diff --git
a/planetlab-2.6.27-i686.config
b/planetlab-2.6.27-i686.config
index
8285e2f
..
f31922f
100644
(file)
--- a/
planetlab-2.6.27-i686.config
+++ b/
planetlab-2.6.27-i686.config
@@
-1101,8
+1101,8
@@
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
CONFIG_IFB=m
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
CONFIG_IFB=m
-CONFIG_DUMMY=m
CONFIG_EGRE=m
CONFIG_EGRE=m
+CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_MACVLAN=y
CONFIG_EQUALIZER=m
CONFIG_BONDING=m
CONFIG_MACVLAN=y
CONFIG_EQUALIZER=m
@@
-1218,7
+1218,6
@@
CONFIG_E1000=m
CONFIG_E1000E=m
# CONFIG_IP1000 is not set
CONFIG_IGB=m
CONFIG_E1000E=m
# CONFIG_IP1000 is not set
CONFIG_IGB=m
-# CONFIG_IGB_LRO is not set
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
@@
-2278,7
+2277,7
@@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
# CONFIG_SECURITY_ROOTPLUG is not set
CONFIG_SECURITY_NETWORK_XFRM=y
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
# CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_
DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_
SECURITY_DEFAULT_MMAP_MIN_ADDR=0
# CONFIG_SECURITY_SMACK is not set
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m
# CONFIG_SECURITY_SMACK is not set
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m