diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-sparc/setup.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/asm-sparc/setup.h')
| -rw-r--r-- | include/asm-sparc/setup.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-sparc/setup.h b/include/asm-sparc/setup.h index b3af958a2ad2..2643c62f4ac0 100644 --- a/include/asm-sparc/setup.h +++ b/include/asm-sparc/setup.h | |||
| @@ -5,6 +5,10 @@ | |||
| 5 | #ifndef _SPARC_SETUP_H | 5 | #ifndef _SPARC_SETUP_H |
| 6 | #define _SPARC_SETUP_H | 6 | #define _SPARC_SETUP_H |
| 7 | 7 | ||
| 8 | #define COMMAND_LINE_SIZE 256 | 8 | #if defined(__sparc__) && defined(__arch64__) |
| 9 | # define COMMAND_LINE_SIZE 2048 | ||
| 10 | #else | ||
| 11 | # define COMMAND_LINE_SIZE 256 | ||
| 12 | #endif | ||
| 9 | 13 | ||
| 10 | #endif /* _SPARC_SETUP_H */ | 14 | #endif /* _SPARC_SETUP_H */ |