diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:24:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:24:34 -0700 |
| commit | 3cf8ad3394b8675e92a35c438f22341197535531 (patch) | |
| tree | 39c9c5b9465e4f63f6cdf9b767d8046eaf0f3ac7 /Documentation | |
| parent | 66cd55d2b903643cbd019ef97a5305d9428d3865 (diff) | |
| parent | 54e5bc020ce1c959eaa7be18cedb734b6b13745e (diff) | |
| download | linux-3cf8ad3394b8675e92a35c438f22341197535531.tar.bz2 | |
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, olpc: Constify an olpc_ofw() arg
x86, olpc: Use pr_debug() for EC commands
x86, olpc: Add comment about implicit optimization barrier
x86, olpc: Add support for calling into OpenFirmware
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/zero-page.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt index feb37e177010..cf5437deda81 100644 --- a/Documentation/x86/zero-page.txt +++ b/Documentation/x86/zero-page.txt @@ -18,6 +18,7 @@ Offset Proto Name Meaning 080/010 ALL hd0_info hd0 disk parameter, OBSOLETE!! 090/010 ALL hd1_info hd1 disk parameter, OBSOLETE!! 0A0/010 ALL sys_desc_table System description table (struct sys_desc_table) +0B0/010 ALL olpc_ofw_header OLPC's OpenFirmware CIF and friends 140/080 ALL edid_info Video mode setup (struct edid_info) 1C0/020 ALL efi_info EFI 32 information (struct efi_info) 1E0/004 ALL alk_mem_k Alternative mem check, in KB |