diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-sh64/setup.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/asm-sh64/setup.h')
| -rw-r--r-- | include/asm-sh64/setup.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-sh64/setup.h b/include/asm-sh64/setup.h index ebd42eb1b709..5b07b14c2927 100644 --- a/include/asm-sh64/setup.h +++ b/include/asm-sh64/setup.h | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | #ifndef __ASM_SH64_SETUP_H | 1 | #ifndef __ASM_SH64_SETUP_H |
| 2 | #define __ASM_SH64_SETUP_H | 2 | #define __ASM_SH64_SETUP_H |
| 3 | 3 | ||
| 4 | #define COMMAND_LINE_SIZE 256 | ||
| 5 | |||
| 6 | #ifdef __KERNEL__ | ||
| 7 | |||
| 4 | #define PARAM ((unsigned char *)empty_zero_page) | 8 | #define PARAM ((unsigned char *)empty_zero_page) |
| 5 | #define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000)) | 9 | #define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000)) |
| 6 | #define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004)) | 10 | #define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004)) |
| @@ -12,5 +16,7 @@ | |||
| 12 | #define COMMAND_LINE ((char *) (PARAM+256)) | 16 | #define COMMAND_LINE ((char *) (PARAM+256)) |
| 13 | #define COMMAND_LINE_SIZE 256 | 17 | #define COMMAND_LINE_SIZE 256 |
| 14 | 18 | ||
| 19 | #endif /* __KERNEL__ */ | ||
| 20 | |||
| 15 | #endif /* __ASM_SH64_SETUP_H */ | 21 | #endif /* __ASM_SH64_SETUP_H */ |
| 16 | 22 | ||