linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / i386 / boot / edd.S

diff --git a/arch/i386/boot/edd.S b/arch/i386/boot/edd.S
index e74958f..d8d69f2 100644 (file)
--- a/arch/i386/boot/edd.S
+++ b/arch/i386/boot/edd.S
@@ -6,7 +6,7 @@
  *   projects 1572D, 1484D, 1386D, 1226DT
  * disk signature read by Matt Domsch <Matt_Domsch@dell.com>
  *     and Andrew Wilks <Andrew_Wilks@dell.com> September 2003, June 2004
- * legacy CHS retreival by Patrick J. LoPresti <patl@users.sourceforge.net>
+ * legacy CHS retrieval by Patrick J. LoPresti <patl@users.sourceforge.net>
  *      March 2004
  * Command line option parsing, Matt Domsch, November 2004
  */
@@ -15,8 +15,8 @@
 #include <asm/setup.h>
 
 #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
-       movb    $0, (EDD_MBR_SIG_NR_BUF)        # zero value at EDD_MBR_SIG_NR_BUF
-       movb    $0, (EDDNR)                     # zero value at EDDNR
+       movb    $0, (EDD_MBR_SIG_NR_BUF)
+       movb    $0, (EDDNR)
 
 # Check the command line for two options:
 # edd=of  disables EDD completely  (edd=off)
@@ -26,7 +26,7 @@
        jz      done_cl
        movl    %cs:(cmd_line_ptr), %esi
 # ds:esi has the pointer to the command line now
-       movl    $(COMMAND_LINE_SIZE-6), %ecx
+       movl    $(COMMAND_LINE_SIZE-7), %ecx
 # loop through kernel command line one byte at a time
 cl_loop:
        cmpl    $EDD_CL_EQUALS, (%si)
@@ -51,7 +51,7 @@ do_edd_off:
 done_cl:
        popl    %esi
 
-    
+
 # Read the first sector of each BIOS disk device and store the 4-byte signature
 edd_mbr_sig_start:
        movb    $0x80, %dl                      # from device 80