diff options
author | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
commit | 0a3f7e48690bb2b7b008300a54554979a55be19a (patch) | |
tree | 7499d52f20040ed7d5a56496ecb81ed114f80719 /builddefs/generic_features.mk | |
parent | fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 (diff) | |
parent | 9b5b0722555891ba94f240760ef3a6d4c870fd13 (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'builddefs/generic_features.mk')
-rw-r--r-- | builddefs/generic_features.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builddefs/generic_features.mk b/builddefs/generic_features.mk index c3f1ec0f72..f195e9fd75 100644 --- a/builddefs/generic_features.mk +++ b/builddefs/generic_features.mk @@ -25,8 +25,6 @@ GENERIC_FEATURES = \ DIP_SWITCH \ DYNAMIC_KEYMAP \ DYNAMIC_MACRO \ - ENCODER \ - ENCODER_MAP \ GRAVE_ESC \ HAPTIC \ KEY_LOCK \ |