X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fixp4xx%2Fconfig-2.6.27;h=4649f91aa24026231828d0a9fe46d6034651e136;hb=c28f9d72f071a1515831e5a0b782dcf6f3975ce8;hp=f0f2937dbdb9404bf2e14762896971d215e5bcb2;hpb=086679e426440add761c55d494b29037bcc7a39f;p=openwrt-10.03%2F.git

diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27
index f0f2937db..4649f91aa 100644
--- a/target/linux/ixp4xx/config-2.6.27
+++ b/target/linux/ixp4xx/config-2.6.27
@@ -1,7 +1,6 @@
 # CONFIG_8139TOO is not set
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_ALIM7101_WDT is not set
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_ADI_COYOTE is not set
 # CONFIG_ARCH_AT91 is not set
@@ -61,7 +60,6 @@ CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ATA_PIIX is not set
 CONFIG_ATA_SFF=y
-# CONFIG_ATL1E is not set
 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
 CONFIG_BASE_SMALL=0
@@ -70,7 +68,6 @@ CONFIG_BITREVERSE=y
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BT_HCIBTUSB is not set
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
@@ -88,24 +85,17 @@ CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_USER is not set
 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
@@ -141,7 +131,6 @@ CONFIG_HAVE_OPROFILE=y
 # CONFIG_HERMES is not set
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-# CONFIG_HP_ILO is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON_VID=y
@@ -163,7 +152,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 +253,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 +266,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
@@ -308,7 +296,6 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SENSORS_AD7414 is not set
@@ -321,18 +308,14 @@ 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
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SSB_POSSIBLE=y
-CONFIG_STP=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TCP_CONG_HSTCP is not set
@@ -356,14 +339,15 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
 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
 CONFIG_XSCALE_PMU=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0