Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[powerpc.git] / include / asm-sparc64 / floppy.h

diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
index 49d49a2..07ccd6f 100644 (file)
--- a/include/asm-sparc64/floppy.h
+++ b/include/asm-sparc64/floppy.h
@@ -10,7 +10,6 @@
 #ifndef __ASM_SPARC64_FLOPPY_H
 #define __ASM_SPARC64_FLOPPY_H
 
-#include <linux/config.h>
 #include <linux/init.h>
 
 #include <asm/page.h>
@@ -738,7 +737,7 @@ static unsigned long __init sun_floppy_init(void)
                if (!sun_floppy_types[0] && sun_floppy_types[1]) {
                        /*
                         * Set the drive exchange bit in FCR on NS87303,
-                        * make shure other bits are sane before doing so.
+                        * make sure other bits are sane before doing so.
                         */
                        ns87303_modify(config, FER, FER_EDM, 0);
                        ns87303_modify(config, ASC, ASC_DRV2_SEL, 0);