diff options
| author | Kyle McMartin <kmcmarti@redhat.com> | 2014-10-21 13:05:11 -0400 |
|---|---|---|
| committer | Kyle McMartin <kmcmarti@redhat.com> | 2014-10-21 13:40:24 -0400 |
| commit | 88b2d0957639b3cb07acd1744ad515af61d2176d (patch) | |
| tree | 0eccad336ec1ad281de1403e473feae45c5d5248 /config-x86-generic | |
| parent | 27d39a95f697200a2f2d38dac457bd6720d2cd61 (diff) | |
| download | kernel-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-x86-generic')
| -rw-r--r-- | config-x86-generic | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic index 719f3e4b3..44f20161b 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -408,8 +408,6 @@ CONFIG_GPIO_ICH=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set -# CONFIG_SERIAL_8250_FINTEK is not set - CONFIG_PCI_CNB20LE_QUIRK=y CONFIG_ACPI_EC_DEBUGFS=m |