sync default kernel config

SVN-Revision: 13280

1 files changed, 3 insertions, 16 deletions

diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index 721cf8e3f5..e7aeecadeb 100644
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -84,6 +84,8 @@ CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
+# CONFIG_CRYPTO_DEV_IXP4XX is not set
+CONFIG_CRYPTO_HW=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"
@@ -147,7 +149,6 @@ CONFIG_I2C_GPIO=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=m
-# CONFIG_INPUT_IXP4XX_BEEPER is not set
 # CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
 # CONFIG_IP6_NF_MATCH_FRAG is not set
@@ -156,7 +157,6 @@ CONFIG_INPUT=m
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IPV6_MROUTE is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -190,8 +190,6 @@ CONFIG_LEDS_LATCH=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LLC2 is not set
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
 CONFIG_MACH_AP1000=y
 CONFIG_MACH_AVILA=y
 CONFIG_MACH_CAMBRIA=y
@@ -216,7 +214,6 @@ CONFIG_MACH_WG302V2=y
 CONFIG_MACH_WRT300NV2=y
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -304,6 +301,7 @@ CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set
+CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_RTC_DRV_DS1307 is not set
@@ -330,7 +328,6 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_SATA_PMP is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SENSORS_AD7418=y
@@ -342,9 +339,7 @@ CONFIG_SENSORS_W83781D=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SHMEM is not set
-CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
-# CONFIG_SND_AW2 is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -363,31 +358,23 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_TINY_SHMEM=y
 CONFIG_UID16=y
 CONFIG_USB=m
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL_MOTOROLA is not set
 # CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_WDM 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_V4L1=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VM_EVENT_COUNTERS=y