diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-x86_64/bootsetup.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-x86_64/bootsetup.h')
| -rw-r--r-- | include/asm-x86_64/bootsetup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86_64/bootsetup.h b/include/asm-x86_64/bootsetup.h index b570a484dc50..b829f7b534be 100644 --- a/include/asm-x86_64/bootsetup.h +++ b/include/asm-x86_64/bootsetup.h | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | #ifndef _X86_64_BOOTSETUP_H | 2 | #ifndef _X86_64_BOOTSETUP_H |
| 3 | #define _X86_64_BOOTSETUP_H 1 | 3 | #define _X86_64_BOOTSETUP_H 1 |
| 4 | 4 | ||
| 5 | extern char x86_boot_params[2048]; | 5 | #define BOOT_PARAM_SIZE 4096 |
| 6 | extern char x86_boot_params[BOOT_PARAM_SIZE]; | ||
| 6 | 7 | ||
| 7 | /* | 8 | /* |
| 8 | * This is set up by the setup-routine at boot-time | 9 | * This is set up by the setup-routine at boot-time |