when changing the mac address of a bridge interface, keep member interface addresses...

[openwrt.git] / target / linux / generic-2.6 / config-2.6.31

diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index d05b2c4..7c1630c 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -607,7 +607,6 @@ CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y

-# CONFIG_GIGASET_CAPI is not set

 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_GPIO_BT8XX is not set


@@ -1523,10 +1522,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set

+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set

 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_IXP4XX is not set
 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_IXP4XX is not set

+# CONFIG_OCF_KIRKWOOD is not set

 # CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set


@@ -2172,7 +2174,6 @@ CONFIG_SQUASHFS_LZMA=y
 CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y

-# CONFIG_SSB_BLOCKIO is not set

 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set