diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-07-11 15:18:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 13:55:54 -0400 |
| commit | f8c09377d754f35a135454181b869ab527cc0757 (patch) | |
| tree | 5df34647452887000d2b3cde92aa21907d3df87a /include/asm-i386 | |
| parent | 48dd643c3b02544994fa091573c2242441a7733f (diff) | |
include/asm-i386/boot.h: This is <asm/boot.h>, not <linux/boot.h>
include/asm-i386/boot.h incorrectly has the multiple include guards
as _LINUX_BOOT_H instead of _ASM_BOOT_H. Fix.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/boot.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-i386/boot.h b/include/asm-i386/boot.h index bd024ab4fe53..ed8affbf96cb 100644 --- a/include/asm-i386/boot.h +++ b/include/asm-i386/boot.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _LINUX_BOOT_H | 1 | #ifndef _ASM_BOOT_H |
| 2 | #define _LINUX_BOOT_H | 2 | #define _ASM_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 | 5 | #define DEF_INITSEG 0x9000 |
| @@ -17,4 +17,4 @@ | |||
| 17 | + (CONFIG_PHYSICAL_ALIGN - 1)) \ | 17 | + (CONFIG_PHYSICAL_ALIGN - 1)) \ |
| 18 | & ~(CONFIG_PHYSICAL_ALIGN - 1)) | 18 | & ~(CONFIG_PHYSICAL_ALIGN - 1)) |
| 19 | 19 | ||
| 20 | #endif /* _LINUX_BOOT_H */ | 20 | #endif /* _ASM_BOOT_H */ |