diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-19 07:45:47 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-19 07:45:47 +1000 |
| commit | 6d372f13528f44919ec193d03248d55a53484968 (patch) | |
| tree | 66f6ba33c6bcfed2b5b3846cf1f309e9b7e715e6 /drivers/gadc | |
| parent | 03914d2d2b438062d3062e2c3a588d53d3040cff (diff) | |
| parent | 37966ff16d923bbca53c9464815cb49cbd7fc3be (diff) | |
| download | uGFX-6d372f13528f44919ec193d03248d55a53484968.tar.gz uGFX-6d372f13528f44919ec193d03248d55a53484968.tar.bz2 uGFX-6d372f13528f44919ec193d03248d55a53484968.zip | |
Merge branch 'master' into freertos
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 |