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/multiple/X/gdisp_lld_X.c | |
| 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/multiple/X/gdisp_lld_X.c')
| -rw-r--r-- | drivers/multiple/X/gdisp_lld_X.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index dcc76d09..940f4f7b 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -15,8 +15,8 @@ #if GFX_USE_GDISP #define GDISP_DRIVER_VMT GDISPVMT_X11 -#include "../drivers/multiple/X/gdisp_lld_config.h" -#include "gdisp/lld/gdisp_lld.h" +#include "drivers/multiple/X/gdisp_lld_config.h" +#include "src/gdisp/driver.h" /** * Our color model - Default or 24 bit only. @@ -40,7 +40,7 @@ #if GINPUT_NEED_MOUSE /* Include mouse support code */ - #include "ginput/lld/mouse.h" + #include "src/ginput/driver_mouse.h" #endif #include <X11/Xlib.h> |