diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-03-14 07:38:02 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-03-14 07:38:02 +1000 |
| commit | 6f54bde79c553301a35535a0a71a4a09b181abfa (patch) | |
| tree | 1408ad80459cd09da47960b4905d50195916639d /drivers/gdisp | |
| parent | 6d372f13528f44919ec193d03248d55a53484968 (diff) | |
| parent | ea5a1b849df6e5085a92957ad387f9e653674415 (diff) | |
| download | uGFX-6f54bde79c553301a35535a0a71a4a09b181abfa.tar.gz uGFX-6f54bde79c553301a35535a0a71a4a09b181abfa.tar.bz2 uGFX-6f54bde79c553301a35535a0a71a4a09b181abfa.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'drivers/gdisp')
| -rw-r--r-- | drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c | 2 | ||||
| -rw-r--r-- | drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c index 35492541..1b581d4d 100644 --- a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c +++ b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c @@ -41,7 +41,7 @@ /* Driver local functions. */ /*===========================================================================*/ -#include "../drivers/gdisp/HX8347D/HX8347D.h" +#include "drivers/gdisp/HX8347D/HX8347D.h" #define write_reg(g, reg, data) { write_index(g, reg); write_data(g, data); } diff --git a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c index 134e3614..d6679714 100644 --- a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c +++ b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c @@ -47,7 +47,7 @@ #define GDISP_INITIAL_BACKLIGHT 100 #endif -#include "../drivers/gdisp/ILI9341/ILI9341.h" +#include "drivers/gdisp/ILI9341/ILI9341.h" /*===========================================================================*/ /* Driver local functions. */ |