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 0d75a46..7c1630c 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -337,6 +337,7 @@ CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_CONNECTOR is not set
 CONFIG_CONSTRUCTORS=y
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_FREQ is not set
@@ -531,15 +532,18 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_GOLDFISH is not set
+# CONFIG_FB_HGA is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB is not set
 # CONFIG_FB_KYRO is not set
+# CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_N411 is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_OF is not set
@@ -579,6 +583,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
 CONFIG_FRAME_WARN=1024
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
 # CONFIG_FREEZER is not set
 # CONFIG_FSCACHE is not set
 CONFIG_FSNOTIFY=y
@@ -602,6 +607,7 @@ CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
+# CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_DEVICE is not set
@@ -692,6 +698,7 @@ CONFIG_HOTPLUG=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYSDN is not set
 CONFIG_HZ=100
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_100=y
@@ -991,7 +998,20 @@ CONFIG_IPW2200_MONITOR=y
 # CONFIG_IRDA is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_EICON is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_WITH_ABC is not set
 # CONFIG_ISL29003 is not set
 # CONFIG_ISO9660_FS is not set
 # CONFIG_IWL3945 is not set
@@ -1045,8 +1065,7 @@ CONFIG_KMOD=y
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LATENCYTOP is not set
-# CONFIG_LBDAF is not set
-# CONFIG_LBD is not set
+CONFIG_LBDAF=y
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
@@ -1093,8 +1112,10 @@ CONFIG_LOCKD_V4=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGO is not set
 # CONFIG_LSF is not set
 # CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
 # CONFIG_LXT_PHY is not set
 CONFIG_MAC80211_DEFAULT_PS_VALUE=1
 CONFIG_MAC80211_DEFAULT_PS=y
@@ -1441,12 +1462,12 @@ CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFTL is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NL80211=y
@@ -1501,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_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_KIRKWOOD is not set
 # CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set
@@ -1574,6 +1598,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set
+# CONFIG_PCI is not set
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
@@ -1586,7 +1611,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_STUB is not set
 CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y
 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_DEBUG is not set
@@ -1761,6 +1785,7 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8366_SMI is not set
 # CONFIG_RTL8366S_PHY_DEBUG_FS is not set
 # CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_S2IO is not set
@@ -1830,6 +1855,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_MPT2SAS is not set
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_NSP32 is not set
@@ -2019,6 +2045,7 @@ CONFIG_SLAB=y
 # CONFIG_SND_CS46XX is not set
 # CONFIG_SND_CS5530 is not set
 # CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_DARLA24 is not set
 # CONFIG_SND_DEBUG is not set
@@ -2051,7 +2078,9 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_ICE1712 is not set
 # CONFIG_SND_ICE1724 is not set
 # CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
 # CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
 # CONFIG_SND_INDIGO is not set
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
@@ -2062,6 +2091,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LAYLA20 is not set
 # CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LX6464ES is not set
 # CONFIG_SND_MAESTRO3 is not set
 # CONFIG_SND_MIA is not set
 # CONFIG_SND_MIPS is not set
@@ -2078,7 +2108,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_OPTI93X is not set
 CONFIG_SND_OSSEMUL=y
 # CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCI is not set
+CONFIG_SND_PCI=y
 # CONFIG_SND_PCMCIA is not set
 # CONFIG_SND_PCM is not set
 # CONFIG_SND_PCM_OSS is not set
@@ -2096,6 +2126,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_SBAWE is not set
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SONICVIBES is not set
@@ -2143,7 +2174,6 @@ CONFIG_SQUASHFS_LZMA=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
@@ -2252,6 +2282,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TUN is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UCB1400_CORE is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UDF_NLS=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"