diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:14:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:14:41 -0400 |
| commit | bec706838ec2f9c8c2b99e88a1270d7cba159b06 (patch) | |
| tree | 96ec3ccbab3596dee79ef874483238853351a4f8 /arch/x86/boot/header.S | |
| parent | bb7762961d3ce745688e9050e914c1d3f980268d (diff) | |
| parent | ee0736627d3347be0be2769fa7b26431f9726c9d (diff) | |
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, setup: fix comment in the "glove box" code
x86, setup: "glove box" BIOS interrupts in the video code
x86, setup: "glove box" BIOS interrupts in the MCA code
x86, setup: "glove box" BIOS interrupts in the EDD code
x86, setup: "glove box" BIOS interrupts in the APM code
x86, setup: "glove box" BIOS interrupts in the core boot code
x86, setup: "glove box" BIOS calls -- infrastructure
Diffstat (limited to 'arch/x86/boot/header.S')
| -rw-r--r-- | arch/x86/boot/header.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 1040f6e8010c..b31cc54b4641 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S | |||
| @@ -237,7 +237,7 @@ init_size: .long INIT_SIZE # kernel initialization size | |||
| 237 | 237 | ||
| 238 | # End of setup header ##################################################### | 238 | # End of setup header ##################################################### |
| 239 | 239 | ||
| 240 | .section ".inittext", "ax" | 240 | .section ".entrytext", "ax" |
| 241 | start_of_setup: | 241 | start_of_setup: |
| 242 | #ifdef SAFE_RESET_DISK_CONTROLLER | 242 | #ifdef SAFE_RESET_DISK_CONTROLLER |
| 243 | # Reset the disk controller. | 243 | # Reset the disk controller. |