Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / sparc / kernel / auxio.c

diff --git a/arch/sparc/kernel/auxio.c b/arch/sparc/kernel/auxio.c
index d3b3648362c09c33aee079aa799f5f78921793d1..baf4ed3fb0f3d116f6966c48a93a6b7551884bc0 100644 (file)
--- a/arch/sparc/kernel/auxio.c
+++ b/arch/sparc/kernel/auxio.c
@@ -5,7 +5,6 @@
 
 #include <linux/stddef.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <asm/oplib.h>
 #include <asm/io.h>
@@ -89,7 +88,7 @@ void set_auxio(unsigned char bits_on, unsigned char bits_off)
                break;
        case sun4m:
                if(!auxio_register)
-                       break;     /* VME chassic sun4m, no auxio. */
+                       break;     /* VME chassis sun4m, no auxio. */
                regval = sbus_readb(auxio_register);
                sbus_writeb(((regval | bits_on) & ~bits_off) | AUXIO_ORMEIN4M,
                        auxio_register);