Commit 1e13e8aa authored by Mariusz Gorski's avatar Mariusz Gorski Committed by Greg Kroah-Hartman
Browse files

staging: panel: Reorder DEFAULT_* values redefines 



Change the order of the DEFAULT_* values redefines so that it
matches the Kconfig order.

Signed-off-by: default avatarMariusz Gorski <marius.gorski@gmail.com>
Acked-By: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe4d7e2c

drivers/staging/panel/panel.c

+13 −13
Original line number Diff line number Diff line
@@ -320,16 +320,16 @@ static unsigned char lcd_bits[LCD_PORTS][LCD_BITS][BIT_STATES]; 
#define DEFAULT_LCD_PIN_SDA     PIN_D0

#define DEFAULT_LCD_PIN_BL      PIN_NOT_SET



#ifdef CONFIG_PANEL_PROFILE

#undef DEFAULT_PROFILE

#define DEFAULT_PROFILE CONFIG_PANEL_PROFILE

#endif



#ifdef CONFIG_PANEL_PARPORT

#undef DEFAULT_PARPORT

#define DEFAULT_PARPORT CONFIG_PANEL_PARPORT

#endif



#ifdef CONFIG_PANEL_PROFILE

#undef DEFAULT_PROFILE

#define DEFAULT_PROFILE CONFIG_PANEL_PROFILE

#endif



#if DEFAULT_PROFILE == 0	/* custom */

#ifdef CONFIG_PANEL_KEYPAD

#undef DEFAULT_KEYPAD
@@ -341,6 +341,11 @@ static unsigned char lcd_bits[LCD_PORTS][LCD_BITS][BIT_STATES]; 
#define DEFAULT_LCD CONFIG_PANEL_LCD

#endif



#ifdef CONFIG_PANEL_LCD_HEIGHT

#undef DEFAULT_LCD_HEIGHT

#define DEFAULT_LCD_HEIGHT CONFIG_PANEL_LCD_HEIGHT

#endif



#ifdef CONFIG_PANEL_LCD_WIDTH

#undef DEFAULT_LCD_WIDTH

#define DEFAULT_LCD_WIDTH CONFIG_PANEL_LCD_WIDTH
@@ -356,9 +361,9 @@ static unsigned char lcd_bits[LCD_PORTS][LCD_BITS][BIT_STATES]; 
#define DEFAULT_LCD_HWIDTH CONFIG_PANEL_LCD_HWIDTH

#endif



#ifdef CONFIG_PANEL_LCD_HEIGHT

#undef DEFAULT_LCD_HEIGHT

#define DEFAULT_LCD_HEIGHT CONFIG_PANEL_LCD_HEIGHT

#ifdef CONFIG_PANEL_LCD_CHARSET

#undef DEFAULT_LCD_CHARSET

#define DEFAULT_LCD_CHARSET CONFIG_PANEL_LCD_CHARSET

#endif



#ifdef CONFIG_PANEL_LCD_PROTO
@@ -396,11 +401,6 @@ static unsigned char lcd_bits[LCD_PORTS][LCD_BITS][BIT_STATES]; 
#define DEFAULT_LCD_PIN_BL CONFIG_PANEL_LCD_PIN_BL

#endif



#ifdef CONFIG_PANEL_LCD_CHARSET

#undef DEFAULT_LCD_CHARSET

#define DEFAULT_LCD_CHARSET CONFIG_PANEL_LCD_CHARSET

#endif



#endif /* DEFAULT_PROFILE == 0 */



/* global variables */