Merge tag 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[sfrench/cifs-2.6.git] / drivers / staging / fbtft / fb_ili9340.c

diff --git a/drivers/staging/fbtft/fb_ili9340.c b/drivers/staging/fbtft/fb_ili9340.c
index 985687d94ec238622a29ce78d41051550a4e53b6..0f4a42f89e5e2cfb0ba5a94331d3f582fb2352d7 100644 (file)
--- a/drivers/staging/fbtft/fb_ili9340.c
+++ b/drivers/staging/fbtft/fb_ili9340.c
@@ -39,12 +39,12 @@ static int init_display(struct fbtft_par *par)
        par->fbtftops.reset(par);
 
        write_reg(par, 0xEF, 0x03, 0x80, 0x02);
-       write_reg(par, 0xCF, 0x00 , 0XC1 , 0X30);
-       write_reg(par, 0xED, 0x64 , 0x03 , 0X12 , 0X81);
-       write_reg(par, 0xE8, 0x85 , 0x00 , 0x78);
-       write_reg(par, 0xCB, 0x39 , 0x2C , 0x00 , 0x34 , 0x02);
+       write_reg(par, 0xCF, 0x00, 0XC1, 0X30);
+       write_reg(par, 0xED, 0x64, 0x03, 0X12, 0X81);
+       write_reg(par, 0xE8, 0x85, 0x00, 0x78);
+       write_reg(par, 0xCB, 0x39, 0x2C, 0x00, 0x34, 0x02);
        write_reg(par, 0xF7, 0x20);
-       write_reg(par, 0xEA, 0x00 , 0x00);
+       write_reg(par, 0xEA, 0x00, 0x00);
 
        /* Power Control 1 */
        write_reg(par, 0xC0, 0x23);
@@ -104,7 +104,7 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
        /* Column address */
        write_reg(par, 0x2A, xs >> 8, xs & 0xFF, xe >> 8, xe & 0xFF);
 
-       /* Row adress */
+       /* Row address */
        write_reg(par, 0x2B, ys >> 8, ys & 0xFF, ye >> 8, ye & 0xFF);
 
        /* Memory write */