--- v3
+++ v4
@@ -16,13 +16,13 @@
drivers/staging/sm750fb/ddk750_reg.h | 18 +-
drivers/staging/sm750fb/ddk750_sii164.c | 394 +++++++++++++++----------------
drivers/staging/sm750fb/ddk750_sii164.h | 28 +--
- drivers/staging/sm750fb/sm750.h | 24 +-
+ drivers/staging/sm750fb/sm750.h | 26 +-
drivers/staging/sm750fb/sm750_accel.c | 370 ++++++++++++++---------------
drivers/staging/sm750fb/sm750_accel.h | 4 +-
drivers/staging/sm750fb/sm750_help.h | 26 +-
drivers/staging/sm750fb/sm750_hw.c | 70 +++---
drivers/staging/sm750fb/sm750_hw.h | 28 +--
- 18 files changed, 915 insertions(+), 915 deletions(-)
+ 18 files changed, 916 insertions(+), 916 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_display.c b/drivers/staging/sm750fb/ddk750_display.c
index a3e6720..1c4049f 100644
@@ -1848,7 +1848,7 @@
unsigned short sii164GetVendorID(void);
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
-index cc80580..bf894cc 100644
+index cc80580..71e9a7a 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -5,7 +5,7 @@
@@ -1871,6 +1871,15 @@
*/
struct lynx_share{
/* common members */
+@@ -115,7 +115,7 @@ struct lynxfb_crtc{
+ int(*proc_checkMode)(struct lynxfb_crtc*, struct fb_var_screeninfo*);
+ int(*proc_setColReg)(struct lynxfb_crtc*, ushort, ushort, ushort, ushort);
+ void (*clear)(struct lynxfb_crtc*);
+- /* pan display */
++ /* pan display */
+ int (*proc_panDisplay)(struct lynxfb_crtc *,
+ const struct fb_var_screeninfo *,
+ const struct fb_info *);
@@ -126,17 +126,17 @@ struct lynxfb_crtc{
struct lynxfb_output{
int dpms;