diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/lcd.h | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/lcd.h')
| -rw-r--r-- | include/lcd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/lcd.h b/include/lcd.h index 44ac8ef..15affb8 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -211,8 +211,8 @@ void lcd_printf (const char *fmt, ...); * the LCD controller and memory allocation. Someone has to know what * is connected, as we can't autodetect anything. */ -#define CFG_HIGH 0 /* Pins are active high */ -#define CFG_LOW 1 /* Pins are active low */ +#define CONFIG_SYS_HIGH 0 /* Pins are active high */ +#define CONFIG_SYS_LOW 1 /* Pins are active low */ #define LCD_MONOCHROME 0 #define LCD_COLOR2 1 |