diff --git a/[refs] b/[refs]
index e5323dce5ed3..b0415b0be97e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68a61c8d87dae7c7b7cc76ab01190475e87be0d9
+refs/heads/master: 7c4285d8362641b815ea71018139619db965ab34
diff --git a/trunk/include/asm-sparc/setup.h b/trunk/include/asm-sparc/setup.h
index b3af958a2ad2..2643c62f4ac0 100644
--- a/trunk/include/asm-sparc/setup.h
+++ b/trunk/include/asm-sparc/setup.h
@@ -5,6 +5,10 @@
 #ifndef _SPARC_SETUP_H
 #define _SPARC_SETUP_H
 
-#define COMMAND_LINE_SIZE	256
+#if defined(__sparc__) && defined(__arch64__)
+# define COMMAND_LINE_SIZE 2048
+#else
+# define COMMAND_LINE_SIZE 256
+#endif
 
 #endif /* _SPARC_SETUP_H */
diff --git a/trunk/include/asm-sparc64/setup.h b/trunk/include/asm-sparc64/setup.h
index 5053df3cec40..7143d06b2c55 100644
--- a/trunk/include/asm-sparc64/setup.h
+++ b/trunk/include/asm-sparc64/setup.h
@@ -1,10 +1 @@
-/*
- *	Just a place holder. 
- */
-
-#ifndef _SPARC64_SETUP_H
-#define _SPARC64_SETUP_H
-
-#define COMMAND_LINE_SIZE	2048
-
-#endif /* _SPARC64_SETUP_H */
+#include <asm-sparc/setup.h>