diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-x86_64/bootsetup.h | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 |