diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-x86/boot.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'include/asm-x86/boot.h')
| -rw-r--r-- | include/asm-x86/boot.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-x86/boot.h b/include/asm-x86/boot.h index 2faed7ecb092..1d63bd5d5946 100644 --- a/include/asm-x86/boot.h +++ b/include/asm-x86/boot.h | |||
| @@ -1,10 +1,8 @@ | |||
| 1 | #ifndef _ASM_BOOT_H | 1 | #ifndef ASM_X86__BOOT_H |
| 2 | #define _ASM_BOOT_H | 2 | #define ASM_X86__BOOT_H |
| 3 | 3 | ||
| 4 | /* Don't touch these, unless you really know what you're doing. */ | 4 | /* Don't touch these, unless you really know what you're doing. */ |
| 5 | #define DEF_INITSEG 0x9000 | ||
| 6 | #define DEF_SYSSEG 0x1000 | 5 | #define DEF_SYSSEG 0x1000 |
| 7 | #define DEF_SETUPSEG 0x9020 | ||
| 8 | #define DEF_SYSSIZE 0x7F00 | 6 | #define DEF_SYSSIZE 0x7F00 |
| 9 | 7 | ||
| 10 | /* Internal svga startup constants */ | 8 | /* Internal svga startup constants */ |
| @@ -25,4 +23,4 @@ | |||
| 25 | #define BOOT_STACK_SIZE 0x1000 | 23 | #define BOOT_STACK_SIZE 0x1000 |
| 26 | #endif | 24 | #endif |
| 27 | 25 | ||
| 28 | #endif /* _ASM_BOOT_H */ | 26 | #endif /* ASM_X86__BOOT_H */ |