diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-19 08:00:52 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-19 08:00:52 +1000 |
| commit | b82448c3e23663a25a423402343fbca78253b80c (patch) | |
| tree | 57a03e35b88f6e434b6c4d084695fc5ce1061932 /drivers/gadc | |
| parent | dcedf414136e55e6dacbe736babe748e1374e19e (diff) | |
| parent | 37966ff16d923bbca53c9464815cb49cbd7fc3be (diff) | |
| download | uGFX-b82448c3e23663a25a423402343fbca78253b80c.tar.gz uGFX-b82448c3e23663a25a423402343fbca78253b80c.tar.bz2 uGFX-b82448c3e23663a25a423402343fbca78253b80c.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'drivers/gadc')
| -rw-r--r-- | drivers/gadc/AT91SAM7/gadc_lld.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gadc/AT91SAM7/gadc_lld.c b/drivers/gadc/AT91SAM7/gadc_lld.c index 78a60109..f18f2717 100644 --- a/drivers/gadc/AT91SAM7/gadc_lld.c +++ b/drivers/gadc/AT91SAM7/gadc_lld.c @@ -18,7 +18,7 @@ #if GFX_USE_GADC -#include "gadc/lld/gadc_lld.h" +#include "src/gadc/driver.h" static ADCConversionGroup acg = { FALSE, // circular |