Merge branch 'next/dt' into for-next

[deliverable/linux.git] / arch / arm / mach-s3c24xx / mach-n30.c

diff --git a/arch/arm/mach-s3c24xx/mach-n30.c b/arch/arm/mach-s3c24xx/mach-n30.c
index 171c1f11fd224bde7c97196c54294028805a3c0c..070a0d0714a5e169d59e75487970f809122ddc2b 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-n30.c
+++ b/arch/arm/mach-s3c24xx/mach-n30.c
@@ -522,7 +522,7 @@ static void __init n30_hwinit(void)
         *
         * The pull ups for H6/H7 are enabled on N30 but not on the
         * N35/PiN.  I suppose is useful for a budget model of the N30
-        * with no bluetooh.  It doesn't hurt to have the pull ups
+        * with no bluetooth.  It doesn't hurt to have the pull ups
         * enabled on the N35, so leave them enabled for all models.
         */
        __raw_writel(0x0028aaaa, S3C2410_GPHCON);