diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:35:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:35:30 -0500 |
| commit | ec2f9d1331f658433411c58077871e1eef4ee1b4 (patch) | |
| tree | 6d0e5f6665e5c89ee392379967a52e6fcae17cf2 /include | |
| parent | 89697f1d715e20fff0361cca79efd5a371623af7 (diff) | |
| parent | 34cc560e6a72ff414ff7d107426a411b0a093ad3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Re-export saved_command_line to modules.
[SPARC64]: Increase command line size to 2048 like other arches.
[SPARC64]: We do not need ZONE_DMA.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/setup.h b/include/asm-sparc64/setup.h index b356ee2cda92..5053df3cec40 100644 --- a/include/asm-sparc64/setup.h +++ b/include/asm-sparc64/setup.h | |||
| @@ -5,6 +5,6 @@ | |||
| 5 | #ifndef _SPARC64_SETUP_H | 5 | #ifndef _SPARC64_SETUP_H |
| 6 | #define _SPARC64_SETUP_H | 6 | #define _SPARC64_SETUP_H |
| 7 | 7 | ||
| 8 | #define COMMAND_LINE_SIZE 256 | 8 | #define COMMAND_LINE_SIZE 2048 |
| 9 | 9 | ||
| 10 | #endif /* _SPARC64_SETUP_H */ | 10 | #endif /* _SPARC64_SETUP_H */ |