kernel: use upstream fixes for bgmac and BCM4709(4)

[openwrt.git] / target / linux / generic / config-4.3

diff --git a/target/linux/generic/config-4.3 b/target/linux/generic/config-4.3
index 9b189df..5a7ee07 100644 (file)
--- a/target/linux/generic/config-4.3
+++ b/target/linux/generic/config-4.3
@@ -773,6 +773,7 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 # CONFIG_CRYPTO_DEV_IMGTEC_HASH is not set
+# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
 # CONFIG_CRYPTO_DEV_MV_CESA is not set
 # CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
 # CONFIG_CRYPTO_DEV_QCE is not set
@@ -988,6 +989,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
@@ -4681,7 +4684,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_ZR364XX is not set
-CONFIG_USERFAULTFD=y
+# CONFIG_USERFAULTFD is not set
 # CONFIG_USELIB is not set
 # CONFIG_USE_GENERIC_SMP_HELPERS is not set
 # CONFIG_USE_OF is not set