diff options
| author | Mariusz Gorski <marius.gorski@gmail.com> | 2014-11-12 02:08:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 13:53:25 -0800 |
| commit | 1e13e8aa1f88c4ac29f4fde4bfcc39c636e83015 (patch) | |
| tree | 5797adfd4c0ade2174908f314be404bfb53ec899 /drivers/staging/panel | |
| parent | fe4d7e2cc9eaf5d3b3885bdbd24080881270557c (diff) | |
| download | linux-1e13e8aa1f88c4ac29f4fde4bfcc39c636e83015.tar.gz linux-1e13e8aa1f88c4ac29f4fde4bfcc39c636e83015.tar.bz2 linux-1e13e8aa1f88c4ac29f4fde4bfcc39c636e83015.zip | |
staging: panel: Reorder DEFAULT_* values redefines
Change the order of the DEFAULT_* values redefines so that it
matches the Kconfig order.
Signed-off-by: Mariusz Gorski <marius.gorski@gmail.com>
Acked-By: Willy Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/panel')
| -rw-r--r-- | drivers/staging/panel/panel.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index 530f7e185231..4434c1d948d2 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -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 */ |