diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-01-15 20:27:20 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-15 20:27:20 +0300 |
commit | c0106d72b8d71696dbe9dc80e2c77d4ac63f7531 (patch) | |
tree | ca96d2baecb0555e36219ed6968dc8e306e530ca /Documentation/x86/zero-page.txt | |
parent | 5852973c129cf7c7e6c229abb7250673fc2a50c9 (diff) | |
parent | eff317d0834ad1ff03f747f6bc2d76b9a9c95160 (diff) | |
download | linux-c0106d72b8d71696dbe9dc80e2c77d4ac63f7531.tar.xz |
Merge branch 'topic/asoc' into next/asoc
Diffstat (limited to 'Documentation/x86/zero-page.txt')
-rw-r--r-- | Documentation/x86/zero-page.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt index 169ad423a3d1..4f913857b8a2 100644 --- a/Documentation/x86/zero-page.txt +++ b/Documentation/x86/zero-page.txt @@ -3,7 +3,7 @@ protocol of kernel. These should be filled by bootloader or 16-bit real-mode setup code of the kernel. References/settings to it mainly are in: - include/asm-x86/bootparam.h + arch/x86/include/asm/bootparam.h Offset Proto Name Meaning |