Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58774
b: refs/heads/master
c: f8c0937
h: refs/heads/master
v: v3
  • Loading branch information
H. Peter Anvin authored and Linus Torvalds committed Jul 12, 2007
1 parent bb63429 commit 6e431df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 48dd643c3b02544994fa091573c2242441a7733f
refs/heads/master: f8c09377d754f35a135454181b869ab527cc0757
6 changes: 3 additions & 3 deletions trunk/include/asm-i386/boot.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _LINUX_BOOT_H
#define _LINUX_BOOT_H
#ifndef _ASM_BOOT_H
#define _ASM_BOOT_H

/* Don't touch these, unless you really know what you're doing. */
#define DEF_INITSEG 0x9000
Expand All @@ -17,4 +17,4 @@
+ (CONFIG_PHYSICAL_ALIGN - 1)) \
& ~(CONFIG_PHYSICAL_ALIGN - 1))

#endif /* _LINUX_BOOT_H */
#endif /* _ASM_BOOT_H */

0 comments on commit 6e431df

Please sign in to comment.