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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
configs
/
ibmchrp_defconfig
diff --git
a/arch/ppc/configs/ibmchrp_defconfig
b/arch/ppc/configs/ibmchrp_defconfig
index
a3b6ec0
..
27f3e69
100644
(file)
--- a/
arch/ppc/configs/ibmchrp_defconfig
+++ b/
arch/ppc/configs/ibmchrp_defconfig
@@
-367,7
+367,6
@@
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
-# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m