Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / drivers / block / hd.c

diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index 30ec6b3..007c630 100644 (file)
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -733,7 +733,7 @@ static int __init hd_init(void)
                 * the BIOS or CMOS.  This doesn't work all that well,
                 * since this assumes that this is a primary or secondary
                 * drive, and if we're using this legacy driver, it's
-                * probably an auxilliary controller added to recover
+                * probably an auxiliary controller added to recover
                 * legacy data off an ST-506 drive.  Either way, it's
                 * definitely safest to have the user explicitly specify
                 * the information.