diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2020-03-31 15:13:58 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2020-03-31 15:13:58 -0700 |
| commit | 8fe512c7e95b3bd31348c510780eeb33185741ce (patch) | |
| tree | b188c62fb1b0eef23c65484365fcde2893cef5f5 /py/objmodule.c | |
| parent | 4b063aeb29c889809af0758351e68eda48e37f3a (diff) | |
| parent | f47b964c5ff838153ebaff2077405b0f4f881565 (diff) | |
Merge remote-tracking branch 'adafruit/master' into lower_power
Diffstat (limited to 'py/objmodule.c')
| -rw-r--r-- | py/objmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objmodule.c b/py/objmodule.c index 7405a6919..b6a8a084e 100644 --- a/py/objmodule.c +++ b/py/objmodule.c @@ -213,7 +213,7 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = { { MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) }, #endif #endif -#if MICROPY_PY_ULAB +#if CIRCUITPY_ULAB #if CIRCUITPY // CircuitPython: Defined in MICROPY_PORT_BUILTIN_MODULES, so not defined here. // TODO: move to shared-bindings/ |