Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of git://git...

[~andy/linux] / arch / x86 / boot / header.S

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index efe5acfc79c30c8ab2df32586618fa6f7c2fc88b..9b9c6475b3614ccf976cbb5bb462ea9c6b3a52f0 100644 (file)
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -406,13 +406,6 @@ init_size:         .long INIT_SIZE         # kernel initialization size
 
        .section ".entrytext", "ax"
 start_of_setup:
-#ifdef SAFE_RESET_DISK_CONTROLLER
-# Reset the disk controller.
-       movw    $0x0000, %ax            # Reset disk controller
-       movb    $0x80, %dl              # All disks
-       int     $0x13
-#endif
-
 # Force %es = %ds
        movw    %ds, %ax
        movw    %ax, %es