diff options
author | Perry Hung <iperry@gmail.com> | 2011-03-21 02:45:58 -0400 |
---|---|---|
committer | Perry Hung <iperry@gmail.com> | 2011-03-21 02:47:53 -0400 |
commit | 7241820179bb729d14900676fbff943f7f44cb97 (patch) | |
tree | d60a38f908eda00b934b6d3452f6a777c4277be6 /libmaple/rules.mk | |
parent | 1591fc9e3f851327c16bbcb88e6abee1706f9cfc (diff) | |
parent | c73306508820705eef4f2cb9f8542acdba599cd8 (diff) | |
download | librambutan-7241820179bb729d14900676fbff943f7f44cb97.tar.gz librambutan-7241820179bb729d14900676fbff943f7f44cb97.zip |
Merge branch 'i2c-wip' into refactor
Conflicts:
examples/test-fsmc.cpp
libmaple/rules.mk
wirish/boards.h
Diffstat (limited to 'libmaple/rules.mk')
-rw-r--r-- | libmaple/rules.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmaple/rules.mk b/libmaple/rules.mk index b264b96..48b5ed4 100644 --- a/libmaple/rules.mk +++ b/libmaple/rules.mk @@ -23,6 +23,7 @@ cSRCS_$(d) := adc.c \ iwdg.c \ nvic.c \ pwr.c \ + i2c.c \ rcc.c \ spi.c \ syscalls.c \ |