aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-10-05 06:26:28 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-10-05 06:26:28 +0000
commit12701b1d25861c613347a62f0725e900086cd9ee (patch)
treecd11b430929c09817b59c85b1274912386ebfafd /target/linux/ixp4xx
parentfd03974e369bf3cf85eb5423bf4c1d6a02b4a387 (diff)
downloadupstream-12701b1d25861c613347a62f0725e900086cd9ee.tar.gz
upstream-12701b1d25861c613347a62f0725e900086cd9ee.tar.bz2
upstream-12701b1d25861c613347a62f0725e900086cd9ee.zip
refresh 2.6.27 patches based on -rc8
SVN-Revision: 12858
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/config-2.6.2712
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27
index f0f2937dbd..b0241a85b9 100644
--- a/target/linux/ixp4xx/config-2.6.27
+++ b/target/linux/ixp4xx/config-2.6.27
@@ -96,16 +96,12 @@ CONFIG_DEFAULT_TCP_CONG="westwood"
# CONFIG_DEFAULT_VEGAS is not set
CONFIG_DEFAULT_WESTWOOD=y
CONFIG_DEVPORT=y
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
# CONFIG_DM9000 is not set
CONFIG_DMABOUNCE=y
CONFIG_DMABOUNCE_DEBUG=y
# CONFIG_DMADEVICES is not set
CONFIG_DNOTIFY=y
-# CONFIG_DSCC4 is not set
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FARSYNC is not set
CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
@@ -163,7 +159,6 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_ISDN is not set
# CONFIG_IWMMXT is not set
CONFIG_IXP4XX_ETH=y
-# CONFIG_IXP4XX_HSS is not set
# CONFIG_IXP4XX_INDIRECT_PCI is not set
CONFIG_IXP4XX_NPE=y
CONFIG_IXP4XX_QMGR=y
@@ -265,6 +260,7 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_NATSEMI is not set
+CONFIG_NF_CT_ACCT=y
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_ISO8859_1 is not set
@@ -277,7 +273,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PATA_ARTOP=m
CONFIG_PATA_IXP4XX_CF=m
# CONFIG_PATA_SCH is not set
-# CONFIG_PC300 is not set
CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
# CONFIG_R6040 is not set
@@ -321,9 +316,7 @@ CONFIG_SENSORS_W83781D=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SHMEM is not set
-CONFIG_SLAB=y
CONFIG_SLABINFO=y
-# CONFIG_SLUB is not set
# CONFIG_SND_ARM is not set
CONFIG_SND_DRIVERS=y
CONFIG_SND_USB=y
@@ -361,6 +354,9 @@ CONFIG_VECTORS_BASE=0xffff0000
# CONFIG_VGASTATE is not set
# CONFIG_VIA_RHINE is not set
CONFIG_VIA_VELOCITY=m
+CONFIG_VIDEO_MEDIA=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_COMMON=m
# CONFIG_VLAN_8021Q_GVRP is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_XFRM_IPCOMP=m