Merge branch 'master' into lua

mcb30 · Feb 7, 2011 · 0405304 · 0405304
2 parents 9716800 + e5291cb
commit 0405304
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -21,6 +21,9 @@ Changes in 4.04:
 	* Fix booting on non-partitioned devices.
 	* MBR, isohybrid: Workaround for a BIOS issue on Acer
 	  Travelmate and possibly other machines.
+        * COM32: Adding ACPI parsing libary
+        * HDT: Release 0.4.1 to support ACPI parsing, 
+          improved mutli-core/cpu reporting 
 
 Changes in 4.03:
 	* Don't hang if no configuration file is found.

diff --git a/core/diskboot.inc b/core/diskboot.inc
@@ -162,7 +162,7 @@ floppy:
 		mov [bx+2],ax		; Segment 0
 		fs rep movsw		; Faster to move words
 		mov cl,[bsSecPerTrack]  ; Patch the sector count
-		mov [di-76+8],cl
+		mov [di-12+4],cl
 
 		push ax			; Partition offset == 0
 		push ax