Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / drivers / parisc / eisa_enumerator.c

diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c
index c709ecc..0be1d50 100644 (file)
--- a/drivers/parisc/eisa_enumerator.c
+++ b/drivers/parisc/eisa_enumerator.c
@@ -101,7 +101,7 @@ static int configure_memory(const unsigned char *buf,
                        printk("memory %lx-%lx ", (unsigned long)res->start, (unsigned long)res->end);
                        result = request_resource(mem_parent, res);
                        if (result < 0) {
-                               printk("\n" KERN_ERR "EISA Enumerator: failed to claim EISA Bus address space!\n");
+                               printk(KERN_ERR "EISA Enumerator: failed to claim EISA Bus address space!\n");
                                return result;
                        }
                }
@@ -191,7 +191,7 @@ static int configure_port(const unsigned char *buf, struct resource *io_parent,
                        printk("ioports %lx-%lx ", (unsigned long)res->start, (unsigned long)res->end);
                        result = request_resource(io_parent, res);
                        if (result < 0) {
-                               printk("\n" KERN_ERR "EISA Enumerator: failed to claim EISA Bus address space!\n");
+                               printk(KERN_ERR "EISA Enumerator: failed to claim EISA Bus address space!\n");
                                return result;
                        }
                }
@@ -224,7 +224,7 @@ static int configure_port_init(const unsigned char *buf)
                 case HPEE_PORT_INIT_WIDTH_BYTE:
                        s=1;
                        if (c & HPEE_PORT_INIT_MASK) {
-                               printk("\n" KERN_WARNING "port_init: unverified mask attribute\n");
+                               printk(KERN_WARNING "port_init: unverified mask attribute\n");
                                outb((inb(get_16(buf+len+1) & 
                                          get_8(buf+len+3)) | 
                                      get_8(buf+len+4)), get_16(buf+len+1));
@@ -249,7 +249,7 @@ static int configure_port_init(const unsigned char *buf)
                 case HPEE_PORT_INIT_WIDTH_DWORD:
                        s=4;
                        if (c & HPEE_PORT_INIT_MASK) {
-                               printk("\n" KERN_WARNING "port_init: unverified mask attribute\n");
+                               printk(KERN_WARNING "port_init: unverified mask attribute\n");
                                outl((inl(get_16(buf+len+1) &
                                          get_32(buf+len+3)) |
                                      get_32(buf+len+7)), get_16(buf+len+1));
@@ -259,7 +259,7 @@ static int configure_port_init(const unsigned char *buf)
 
                        break;
                 default:
-                       printk("\n" KERN_ERR "Invalid port init word %02x\n", c);
+                       printk(KERN_ERR "Invalid port init word %02x\n", c);
                        return 0;
                }
                
@@ -297,7 +297,7 @@ static int configure_type_string(const unsigned char *buf)
        /* just skip past the type field */
        len = get_8(buf);
        if (len > 80) {
-               printk("\n" KERN_ERR "eisa_enumerator: type info field too long (%d, max is 80)\n", len);
+               printk(KERN_ERR "eisa_enumerator: type info field too long (%d, max is 80)\n", len);
        }
        
        return 1+len;
@@ -398,7 +398,7 @@ static int parse_slot_config(int slot,
                }
                
                if (p0 + function_len < pos) {
-                       printk("\n" KERN_ERR "eisa_enumerator: function %d length mis-match "
+                       printk(KERN_ERR "eisa_enumerator: function %d length mis-match "
                               "got %d, expected %d\n",
                               num_func, pos-p0, function_len);
                        res=-1;