diff options
author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
---|---|---|
committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /keyboards/lily58/config.h | |
parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/lily58/config.h')
-rw-r--r-- | keyboards/lily58/config.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/keyboards/lily58/config.h b/keyboards/lily58/config.h index fb1cdf3962..50bf2beb32 100644 --- a/keyboards/lily58/config.h +++ b/keyboards/lily58/config.h @@ -24,5 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define USE_I2C #define USE_SERIAL -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION +#if !defined(NO_ACTION_MACRO) + #define NO_ACTION_MACRO +#endif +#if !defined(NO_ACTION_FUNCTION) + #define NO_ACTION_FUNCTION +#endif |