diff options
| author | edman007 <edman007@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2009-11-18 23:21:32 +0000 |
|---|---|---|
| committer | edman007 <edman007@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2009-11-18 23:21:32 +0000 |
| commit | a1101ce4a41b8d11ff88c28735cdc005aba0c203 (patch) | |
| tree | 3b2968dfc221fde83d58196c7bccb5e4a622b8c3 /drv_HD44780.c | |
| parent | 1622daf8d03a8a54f45fb43b256680fd6e3a1593 (diff) | |
| download | lcd4linux-a1101ce4a41b8d11ff88c28735cdc005aba0c203.tar.gz | |
Prevent HD44780 and HD44780_I2C from building at the same time
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1063 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
Diffstat (limited to 'drv_HD44780.c')
| -rw-r--r-- | drv_HD44780.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drv_HD44780.c b/drv_HD44780.c index 9550f8d..bc3a97e 100644 --- a/drv_HD44780.c +++ b/drv_HD44780.c @@ -111,8 +111,8 @@ static unsigned char SIGNAL_ENABLE3; static unsigned char SIGNAL_ENABLE4; static unsigned char SIGNAL_GPO; -static unsigned char SIGNAL_GPI; #ifdef WITH_PARPORT +static unsigned char SIGNAL_GPI; static unsigned char SIGNAL_BACKLIGHT; static unsigned char SIGNAL_POWER; #endif @@ -1410,10 +1410,11 @@ int drv_HD_init(const char *section, const int quiet) /* initialize generic GPIO driver */ if ((ret = drv_generic_gpio_init(section, Name)) != 0) return ret; - + +#ifdef WITH_PARPORT if ((ret = drv_generic_keypad_init(section, Name)) != 0) return ret; - +#endif /* register text widget */ wc = Widget_Text; wc.draw = drv_generic_text_draw; |