diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
| commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
| tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /include/asm-ppc/setup.h | |
| parent | 0b968d23610d65a46299347b141a687e207bd294 (diff) | |
| parent | b2ad7b5e8115582cdf5bbda065aa516c24d62c21 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'include/asm-ppc/setup.h')
| -rw-r--r-- | include/asm-ppc/setup.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-ppc/setup.h b/include/asm-ppc/setup.h deleted file mode 100644 index d2d19ee103df..000000000000 --- a/include/asm-ppc/setup.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #ifdef __KERNEL__ | ||
| 2 | #ifndef _PPC_SETUP_H | ||
| 3 | #define _PPC_SETUP_H | ||
| 4 | |||
| 5 | #define m68k_num_memory num_memory | ||
| 6 | #define m68k_memory memory | ||
| 7 | |||
| 8 | #include <asm-m68k/setup.h> | ||
| 9 | /* We have a bigger command line buffer. */ | ||
| 10 | #undef COMMAND_LINE_SIZE | ||
| 11 | #define COMMAND_LINE_SIZE 512 | ||
| 12 | |||
| 13 | #endif /* _PPC_SETUP_H */ | ||
| 14 | #endif /* __KERNEL__ */ | ||