Changeset 16142


Ignore:
Timestamp:
2009-05-28T17:52:55+02:00 (7 years ago)
Author:
nbd
Message:

merge r16139, r16141 to 8.09

Location:
branches/8.09/target/linux
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/target/linux/brcm-2.4/config-default

    r12276 r16142  
    101101CONFIG_BLUEZ_SCO=m 
    102102# CONFIG_BPQETHER is not set 
    103 # CONFIG_BRIDGE_EBT_802_3 is not set 
    104 # CONFIG_BRIDGE_EBT_AMONG is not set 
    105 # CONFIG_BRIDGE_EBT_ARPF is not set 
    106 # CONFIG_BRIDGE_EBT_ARPREPLY is not set 
    107 # CONFIG_BRIDGE_EBT_BROUTE is not set 
    108 # CONFIG_BRIDGE_EBT_DNAT is not set 
    109 # CONFIG_BRIDGE_EBT_IPF is not set 
    110 # CONFIG_BRIDGE_EBT_LIMIT is not set 
    111 # CONFIG_BRIDGE_EBT_LOG is not set 
    112 # CONFIG_BRIDGE_EBT_MARKF is not set 
    113 # CONFIG_BRIDGE_EBT_MARK_T is not set 
    114 # CONFIG_BRIDGE_EBT_PKTTYPE is not set 
    115 # CONFIG_BRIDGE_EBT_REDIRECT is not set 
    116 # CONFIG_BRIDGE_EBT_SNAT is not set 
    117 # CONFIG_BRIDGE_EBT_STP is not set 
    118 # CONFIG_BRIDGE_EBT_T_FILTER is not set 
    119 # CONFIG_BRIDGE_EBT_T_NAT is not set 
    120 # CONFIG_BRIDGE_EBT_VLANF is not set 
    121 # CONFIG_BRIDGE_NF_EBTABLES is not set 
    122103CONFIG_CARDBUS=y 
    123104CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200" 
     
    165146# CONFIG_IDE_TASK_IOCTL is not set 
    166147# CONFIG_IEEE1394 is not set 
    167 # CONFIG_IP_NF_MATCH_PHYSDEV is not set 
    168 CONFIG_IP_VS=m 
    169 # CONFIG_IP_VS_DEBUG is not set 
    170 CONFIG_IP_VS_DH=m 
    171 CONFIG_IP_VS_FTP=m 
    172 CONFIG_IP_VS_LBLC=m 
    173 CONFIG_IP_VS_LBLCR=m 
    174 CONFIG_IP_VS_LC=m 
    175 CONFIG_IP_VS_NQ=m 
    176 CONFIG_IP_VS_RR=m 
    177 CONFIG_IP_VS_SED=m 
    178 CONFIG_IP_VS_SH=m 
    179 CONFIG_IP_VS_TAB_BITS=12 
    180 CONFIG_IP_VS_WLC=m 
    181 CONFIG_IP_VS_WRR=m 
     148# CONFIG_IP_VS is not set 
    182149# CONFIG_LAN_SAA9730 is not set 
    183150# CONFIG_LNE390 is not set 
     
    205172CONFIG_NEW_IRQ=y 
    206173CONFIG_NEW_TIME_C=y 
    207 CONFIG_NLS=y 
    208174CONFIG_PARPORT=m 
    209175# CONFIG_PARPORT_1284 is not set 
     
    362328# CONFIG_USB_SERIAL_OMNINET is not set 
    363329CONFIG_USB_SERIAL_PL2303=m 
     330# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 
    364331CONFIG_USB_SERIAL_VISOR=m 
    365332# CONFIG_USB_SERIAL_WHITEHEAT is not set 
Note: See TracChangeset for help on using the changeset viewer.