Merge branch 'master' into newmouse

2014-10-26 15:21:43 +01:00 · 2014-10-26 15:21:43 +01:00 · ccf2323335
parent eb84c817a2 3356b5a544
commit ccf2323335
5 changed files with 4 additions and 4 deletions
--- a/drivers/gdisp/LGD4532/driver.mk
+++ b/drivers/gdisp/LGD4532/driver.mk
@ -1,2 +0,0 @@
-GFXINC += $(GFXLIB)/drivers/gdisp/LGD4532
-GFXSRC += $(GFXLIB)/drivers/gdisp/LGD4532/gdisp_lld_LGD4532.c
--- a/drivers/gdisp/LGDP4532/board_LGDP4532_template.h
+++ b/drivers/gdisp/LGDP4532/board_LGDP4532_template.h
--- a/drivers/gdisp/LGDP4532/driver.mk
+++ b/drivers/gdisp/LGDP4532/driver.mk
@ -0,0 +1,2 @@
+GFXINC += $(GFXLIB)/drivers/gdisp/LGDP4532
+GFXSRC += $(GFXLIB)/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
--- a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
+++ b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
@ -19,11 +19,11 @@
 	#undef GDISP_SCREEN_WIDTH
 #endif

-#define GDISP_DRIVER_VMT	GDISPVMT_LGD4532
+#define GDISP_DRIVER_VMT	GDISPVMT_LGDP4532
 #include "gdisp_lld_config.h"
 #include "src/gdisp/driver.h"

-#include "board_LGD4532.h"
+#include "board_LGDP4532.h"

 /*===========================================================================*/
 /* Driver local definitions.                                                 */
--- a/drivers/gdisp/LGDP4532/gdisp_lld_config.h
+++ b/drivers/gdisp/LGDP4532/gdisp_lld_config.h