diff options
| author | Kyle McMartin <kmcmarti@redhat.com> | 2014-11-11 09:38:12 -0500 |
|---|---|---|
| committer | Kyle McMartin <kmcmarti@redhat.com> | 2014-11-11 09:38:12 -0500 |
| commit | 81c4dc55f83517f99282c822fa0def3e308414b5 (patch) | |
| tree | 2adfbd158485261e11d3fe42f1517d7d3b5a5790 /config-generic | |
| parent | 09115662e15ee83248e62465fead50be5ed85f79 (diff) | |
| download | kernel-81c4dc55f83517f99282c822fa0def3e308414b5.tar.gz kernel-81c4dc55f83517f99282c822fa0def3e308414b5.tar.xz kernel-81c4dc55f83517f99282c822fa0def3e308414b5.zip | |
Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 4f2825e61..6c7199f48 100644 --- a/config-generic +++ b/config-generic @@ -5278,3 +5278,6 @@ CONFIG_FMC_CHARDEV=m # CONFIG_SBSAUART_TTY is not set # CONFIG_SERIAL_8250_FINTEK is not set + +# set in x86-generic presently +# CONFIG_TOUCHSCREEN_GOODIX is not set |