projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
drivers
/
serial
/
serial_sh.c
diff --git
a/drivers/serial/serial_sh.c
b/drivers/serial/serial_sh.c
index
0801ac4
..
2b9eeed
100644
(file)
--- a/
drivers/serial/serial_sh.c
+++ b/
drivers/serial/serial_sh.c
@@
-20,8
+20,6
@@
#include <common.h>
#include <asm/processor.h>
-#ifdef CFG_SCIF_CONSOLE
-
#if defined (CONFIG_CONS_SCIF0)
#define SCIF_BASE SCIF0_BASE
#elif defined (CONFIG_CONS_SCIF1)
@@
-215,5
+213,3
@@
int serial_getc(void)
return ch;
}
-
-#endif /* CFG_SCIF_CONSOLE */