git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-m68k
/
setup.h
diff --git
a/include/asm-m68k/setup.h
b/include/asm-m68k/setup.h
index
a89aa84
..
2a8853c
100644
(file)
--- a/
include/asm-m68k/setup.h
+++ b/
include/asm-m68k/setup.h
@@
-23,7
+23,6
@@
#ifndef _M68K_SETUP_H
#define _M68K_SETUP_H
#ifndef _M68K_SETUP_H
#define _M68K_SETUP_H
-#include <linux/config.h>
/*
/*
@@
-42,8
+41,12
@@
#define MACH_Q40 10
#define MACH_SUN3X 11
#define MACH_Q40 10
#define MACH_SUN3X 11
+#define COMMAND_LINE_SIZE 256
+
#ifdef __KERNEL__
#ifdef __KERNEL__
+#define CL_SIZE COMMAND_LINE_SIZE
+
#ifndef __ASSEMBLY__
extern unsigned long m68k_machtype;
#endif /* !__ASSEMBLY__ */
#ifndef __ASSEMBLY__
extern unsigned long m68k_machtype;
#endif /* !__ASSEMBLY__ */
@@
-356,8
+359,6
@@
extern int m68k_is040or060;
*/
#define NUM_MEMINFO 4
*/
#define NUM_MEMINFO 4
-#define CL_SIZE 256
-#define COMMAND_LINE_SIZE CL_SIZE
#ifndef __ASSEMBLY__
struct mem_info {
#ifndef __ASSEMBLY__
struct mem_info {