Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / powerpc / cpu / mpc8xx / serial.c

diff --git a/arch/powerpc/cpu/mpc8xx/serial.c b/arch/powerpc/cpu/mpc8xx/serial.c
index af65c969c2f51c3d9a72629d139bc1e2fbfeeb54..94c785f611c6ed93a684c94d7325f5a003bf70a3 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/serial.c
+++ b/arch/powerpc/cpu/mpc8xx/serial.c
@@ -268,11 +268,6 @@ smc_putc(const char c)
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
        volatile serialbuffer_t *rtx;
 
-#ifdef CONFIG_MODEM_SUPPORT
-       if (gd->be_quiet)
-               return;
-#endif
-
        if (c == '\n')
                smc_putc ('\r');
 
@@ -527,11 +522,6 @@ scc_putc(const char c)
        volatile immap_t        *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
 
-#ifdef CONFIG_MODEM_SUPPORT
-       if (gd->be_quiet)
-               return;
-#endif
-
        if (c == '\n')
                scc_putc ('\r');
 
@@ -637,18 +627,6 @@ void mpc8xx_serial_initialize(void)
 #endif
 }
 
-#ifdef CONFIG_MODEM_SUPPORT
-void disable_putc(void)
-{
-       gd->be_quiet = 1;
-}
-
-void enable_putc(void)
-{
-       gd->be_quiet = 0;
-}
-#endif
-
 #if defined(CONFIG_CMD_KGDB)
 
 void