diff options
Diffstat (limited to 'gfxconf.example.h')
| -rw-r--r-- | gfxconf.example.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gfxconf.example.h b/gfxconf.example.h index e36292e2..d09e9d00 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -96,10 +96,14 @@ #define GDISP_SCREEN_HEIGHT 240
#define GDISP_USE_FSMC
#define GDISP_USE_GPIO
+<<<<<<< HEAD +======= #define GDISP_VMT_NAME1(x) x##YourDriver1
#define GDISP_VMT_NAME2(x) x##YourDriver2
#define TDISP_COLUMNS 16
#define TDISP_ROWS 2
+>>>>>>> 1985906bea97a015d6e035ebb3f91b6e4f94aff1 */
#endif /* _GFXCONF_H */
+
|