diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-08 15:08:08 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-08 15:08:08 +0000 |
| commit | dc141db64de467b6982ec6d7edad3fcf62b994ab (patch) | |
| tree | 7031340f4c70e1319b1c78b31adca329fa1f4bc3 /teensy/main.c | |
| parent | b97669ab9432146c1303dedfaa7b98f7ede3f8db (diff) | |
| parent | e6b6af515449e67d5d3648818a191f3420d6f519 (diff) | |
Merge branch 'master' of github.com:dpgeorge/micropython
Diffstat (limited to 'teensy/main.c')
| -rw-r--r-- | teensy/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/teensy/main.c b/teensy/main.c index 3711cd60d..4844941e7 100644 --- a/teensy/main.c +++ b/teensy/main.c @@ -8,7 +8,7 @@ #include "mpconfig.h" #include "mpqstr.h" #include "lexer.h" -#include "lexerteensy.h" +#include "../stm/lexerstr.h" #include "parse.h" #include "obj.h" #include "compile.h" @@ -378,7 +378,7 @@ void do_repl(void) { stdout_tx_str("\r\n"); } -void main(void) { +int main(void) { pinMode(LED_BUILTIN, OUTPUT); // Wait for host side to get connected while (!usb_vcp_is_connected()) { |