aboutsummaryrefslogtreecommitdiffstats
path: root/glcd/glcd.h
diff options
context:
space:
mode:
authortrsaunders <trsaunders@gmail.com>2012-07-25 18:37:49 +0100
committertrsaunders <trsaunders@gmail.com>2012-07-25 18:37:49 +0100
commitce5fd37e9ba70d8171b2f27e8afa587a2ac34937 (patch)
tree4b2f9b46b12e70fae396f09e5bc05a882e30d482 /glcd/glcd.h
parentf6ce96a444cd12c0f0d5e835b685f0f2e3dd5cae (diff)
parent999486233dd5ec388a8c1c676c19effc6047b090 (diff)
downloaduGFX-ce5fd37e9ba70d8171b2f27e8afa587a2ac34937.tar.gz
uGFX-ce5fd37e9ba70d8171b2f27e8afa587a2ac34937.tar.bz2
uGFX-ce5fd37e9ba70d8171b2f27e8afa587a2ac34937.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'glcd/glcd.h')
-rw-r--r--glcd/glcd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/glcd/glcd.h b/glcd/glcd.h
index 36d3d9b5..e96b2901 100644
--- a/glcd/glcd.h
+++ b/glcd/glcd.h
@@ -95,7 +95,7 @@ uint16_t lcdBGR2RGB(uint16_t color);
uint16_t lcdGetPixelColor(uint16_t x, uint16_t y);
/* Scrolling function */
-glcd_result_t lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines);
+glcd_result_t lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines);
#ifdef __cplusplus
}