summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2014-10-21 13:05:11 -0400
committerKyle McMartin <kmcmarti@redhat.com>2014-10-21 13:40:24 -0400
commit88b2d0957639b3cb07acd1744ad515af61d2176d (patch)
tree0eccad336ec1ad281de1403e473feae45c5d5248 /config-generic
parent27d39a95f697200a2f2d38dac457bd6720d2cd61 (diff)
downloadkernel-88b2d0957639b3cb07acd1744ad515af61d2176d.tar.gz
kernel-88b2d0957639b3cb07acd1744ad515af61d2176d.tar.xz
kernel-88b2d0957639b3cb07acd1744ad515af61d2176d.zip
Re-enable kernel-arm64.patch after updating.
- CONFIG_SERIAL_8250_FINTEK moved to generic since it appears on x86-generic and arm64 now. - CONFIG_IMX_THERMAL=n added to config-arm64.
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index a0b1820a6..4f7848c00 100644
--- a/config-generic
+++ b/config-generic
@@ -5273,3 +5273,5 @@ CONFIG_FMC_CHARDEV=m
# CONFIG_GLOB_SELFTEST is not set
# CONFIG_SBSAUART_TTY is not set
+
+# CONFIG_SERIAL_8250_FINTEK is not set