Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / parisc / kernel / firmware.c

diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index df971fa0c32f1fcbf411437a8e61ce07be5e57af..4896ed0905853ddf809d1db3f2d7bf9d581eb53f 100644 (file)
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -1126,15 +1126,13 @@ int pdc_iodc_print(const unsigned char *str, unsigned count)
        unsigned int i;
        unsigned long flags;
 
-       for (i = 0; i < count && i < 79;) {
+       for (i = 0; i < count;) {
                switch(str[i]) {
                case '\n':
                        iodc_dbuf[i+0] = '\r';
                        iodc_dbuf[i+1] = '\n';
                        i += 2;
                        goto print;
-               case '\b':      /* BS */
-                       i--; /* overwrite last */
                default:
                        iodc_dbuf[i] = str[i];
                        i++;
@@ -1142,15 +1140,6 @@ int pdc_iodc_print(const unsigned char *str, unsigned count)
                }
        }
 
-       /* if we're at the end of line, and not already inserting a newline,
-        * insert one anyway. iodc console doesn't claim to support >79 char
-        * lines. don't account for this in the return value.
-        */
-       if (i == 79 && iodc_dbuf[i-1] != '\n') {
-               iodc_dbuf[i+0] = '\r';
-               iodc_dbuf[i+1] = '\n';
-       }
-
 print:
         spin_lock_irqsave(&pdc_lock, flags);
         real32_call(PAGE0->mem_cons.iodc_io,