Merge branch 'akpm' (patches from Andrew)

[linux-2.6-block.git] / arch / tile / configs / tilegx_defconfig

diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 48357a4e30a0b1722ae4602086ef5bb1a32bb1c9..fd122ef45b0043ce0c091dbe617040c95721cd49 100644 (file)
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -88,7 +88,6 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y