Resync kernel config

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13607 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index 4564f42..e5a03da 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.27
+++ b/target/linux/brcm63xx/config-2.6.27
@@ -24,7 +24,6 @@ CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_BLK_DEV_LOOP is not set
 CONFIG_BOARD_BCM963XX=y
 # CONFIG_BOARD_LIVEBOX is not set
 # CONFIG_BLK_DEV_LOOP is not set
 CONFIG_BOARD_BCM963XX=y
 # CONFIG_BOARD_LIVEBOX is not set

-# CONFIG_BROADCOM_PHY is not set

 # CONFIG_BSD_DISKLABEL is not set
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_CEVT_R4K=y
 # CONFIG_BSD_DISKLABEL is not set
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_CEVT_R4K=y


@@ -64,9 +63,7 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRAMFS=y
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRAMFS=y

-CONFIG_CRYPTO_GF128MUL=m

 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K=y

-CONFIG_DAVICOM_PHY=m

 CONFIG_DEFAULT_BIC=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_BIC=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set


@@ -149,8 +146,6 @@ CONFIG_LXT_PHY=m
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y

-CONFIG_MARVELL_PHY=m
-# CONFIG_MDIO_BITBANG is not set

 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MIKROTIK_RB532 is not set
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MIKROTIK_RB532 is not set


@@ -214,6 +209,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set

+CONFIG_NF_CT_ACCT=y

 CONFIG_NLS=y
 CONFIG_NLS_ASCII=m
 # CONFIG_NO_IOPORT is not set
 CONFIG_NLS=y
 CONFIG_NLS_ASCII=m
 # CONFIG_NO_IOPORT is not set


@@ -236,9 +232,7 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PNX8550_STB810 is not set
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PROBE_INITRD_HEADER is not set

-CONFIG_QSEMI_PHY=m

 # CONFIG_R6040 is not set
 # CONFIG_R6040 is not set

-# CONFIG_REALTEK_PHY is not set

 CONFIG_RELAY=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_LIB=y
 CONFIG_RELAY=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_LIB=y


@@ -254,12 +248,6 @@ CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_BCM63XX=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_BCM63XX=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y

-CONFIG_SERIO=m
-CONFIG_SERIO_I8042=m
-CONFIG_SERIO_LIBPS2=m
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_RAW is not set
-CONFIG_SERIO_SERPORT=m

 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set


@@ -272,7 +260,6 @@ CONFIG_SERIO_SERPORT=m
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set

-# CONFIG_SMSC_PHY is not set

 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set


@@ -280,12 +267,10 @@ CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SQUASHFS_VMALLOC=y
 CONFIG_SSB=m
 CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SQUASHFS_VMALLOC=y
 CONFIG_SSB=m
 CONFIG_SSB_B43_PCI_BRIDGE=y

-# CONFIG_SSB_DRIVER_MIPS is not set

 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y

-CONFIG_SSB_PCMCIAHOST=y

 CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB_SPROM=y
 CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB_SPROM=y