diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-11-26 16:51:00 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-11-27 09:26:42 -0500 |
| commit | 96440958bcce1ee3b72ba020c32883693390bf5b (patch) | |
| tree | 1907b155bda3248b4980109a279f8b19bae47d18 /config-generic | |
| parent | 06ec1977a7a2c0536ca0f2e7d79ed3b8c0699553 (diff) | |
| download | kernel-96440958bcce1ee3b72ba020c32883693390bf5b.tar.gz kernel-96440958bcce1ee3b72ba020c32883693390bf5b.tar.xz kernel-96440958bcce1ee3b72ba020c32883693390bf5b.zip | |
Revert "Merge branch 'master' into baytrail"
This reverts commit 7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2, reversing
changes made to cd44fa829c5e8255bf623a4b072cf85bb61b3092.
This should get the tree back to the state it was before the errant push.
The history will be ugly because Fedora disallows force pushing (sigh), but
oh well.
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config-generic b/config-generic index 109be03d6..9ab515879 100644 --- a/config-generic +++ b/config-generic @@ -2312,9 +2312,6 @@ CONFIG_INPUT_MPU3050=m CONFIG_INPUT_KXTJ9=m # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set -# Baytrail buttons -CONFIG_INPUT_SOC_BUTTON_ARRAY=m - # # Character devices # @@ -5123,7 +5120,7 @@ CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set # CONFIG_MDIO_GPIO is not set -CONFIG_KEYBOARD_GPIO=m +# CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_MOUSE_GPIO is not set # CONFIG_I2C_DESIGNWARE_PLATFORM is not set |