diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-09-02 00:44:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-09-02 00:44:09 +0200 |
| commit | 6e2fbdea1b26d75314d87c380a36b0015bf824cf (patch) | |
| tree | 921a60d936848d731eb7b6875788bac2ad98009c /drivers | |
| parent | df95321ca1b06a6271c3959b371848c10019e165 (diff) | |
| parent | 72739219a12bf02820d29a89cb2b7fdc4d0e840f (diff) | |
| download | blackbird-obmc-uboot-6e2fbdea1b26d75314d87c380a36b0015bf824cf.tar.gz blackbird-obmc-uboot-6e2fbdea1b26d75314d87c380a36b0015bf824cf.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
tx25: Use generic gpio_* calls
config: Always use GNU ld
tools: add kwboot binary to .gitignore file
fdt: Include arch specific gpio.h instead of asm-generic/gpio.h
serial: CONSOLE macro is not used
Conflicts:
board/karo/tx25/tx25.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/serial.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 0d6ad6283a..b10bab70d0 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -84,9 +84,6 @@ static NS16550_t serial_ports[4] = { }; #define PORT serial_ports[port-1] -#if defined(CONFIG_CONS_INDEX) -#define CONSOLE (serial_ports[CONFIG_CONS_INDEX-1]) -#endif #if defined(CONFIG_SERIAL_MULTI) |
