X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-4.1;h=8600709e4b7057aa4450bda6b96452545a01ff44;hp=69d31f682c7b82e7d7a90b5b132667f82f444d91;hb=d2f4479870030d2ca25baeb93bbd8881d6296547;hpb=1c7c99701961166cb9c7387ccaeca93705deb5e6

diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1
index 69d31f682c..8600709e4b 100644
--- a/target/linux/generic/config-4.1
+++ b/target/linux/generic/config-4.1
@@ -344,8 +344,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
-# CONFIG_B53 is not set
-# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_SWCONFIG_B53 is not set
+# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set 
 # CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -357,6 +357,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_PANDORA is not set
+# CONFIG_BACKLIGHT_RPI is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_FULL=y
@@ -549,6 +550,7 @@ CONFIG_BROKEN_ON_SMP=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS is not set
+# CONFIG_BTRFS_FS_POSIX_ACL is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BT_ATH3K is not set
 # CONFIG_BT_BNEP is not set
@@ -962,6 +964,8 @@ CONFIG_DQL=y
 # CONFIG_DS1682 is not set
 # CONFIG_DTLK is not set
 # CONFIG_DUMMY is not set
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_DVB_AU8522_V4L is not set
 # CONFIG_DVB_CORE is not set
@@ -1042,6 +1046,7 @@ CONFIG_EXTRA_TARGETS=""
 # CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_FS is not set
+# CONFIG_F2FS_FS_POSIX_ACL is not set
 # CONFIG_F2FS_IO_TRACE is not set
 # CONFIG_FAIR_GROUP_SCHED is not set
 # CONFIG_FANOTIFY is not set
@@ -1231,7 +1236,6 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_VX855 is not set
 # CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_GPIO_WDT is not set
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
 # CONFIG_GREENASIA_FF is not set
@@ -1256,6 +1260,7 @@ CONFIG_HAVE_KRETPROBES=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFSPLUS_FS_POSIX_ACL is not set
 # CONFIG_HFS_FS is not set
+# CONFIG_HFS_FS_POSIX_ACL is not set
 # CONFIG_HIBERNATION is not set
 # CONFIG_HID is not set
 # CONFIG_HIDRAW is not set
@@ -1922,7 +1927,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_GPIO is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
 # CONFIG_LEDS_TRIGGER_ONESHOT is not set
 CONFIG_LEDS_TRIGGER_TIMER=y
@@ -2567,8 +2571,6 @@ CONFIG_NET_SCHED=y
 # CONFIG_NET_SCH_CODEL is not set
 # CONFIG_NET_SCH_DRR is not set
 # CONFIG_NET_SCH_DSMARK is not set
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_SCH_FQ is not set
 CONFIG_NET_SCH_FQ_CODEL=y
@@ -2715,6 +2717,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NF_NAT_TFTP is not set
 # CONFIG_NF_REJECT_IPV4 is not set
+# CONFIG_NF_REJECT_IPV6 is not set
 # CONFIG_NF_TABLES is not set
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
@@ -2797,19 +2800,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_OBS600 is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OCF_UBSEC_SSB is not set
 # CONFIG_OC_ETM is not set
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_OF_SELFTEST is not set
@@ -2840,9 +2830,9 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PANEL is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_ON_OOPS_VALUE=1
+CONFIG_PANIC_TIMEOUT=1
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PARPORT_1284 is not set
@@ -3742,7 +3732,10 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_GUSCLASSIC is not set
 # CONFIG_SND_GUSEXTREME is not set
 # CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_HDA_INPUT_JACK is not set
 # CONFIG_SND_HDA_INTEL is not set
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_PREALLOC_SIZE=64
 # CONFIG_SND_HDSP is not set
 # CONFIG_SND_HDSPM is not set
 # CONFIG_SND_HRTIMER is not set
@@ -4435,6 +4428,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PHY is not set