diff options
| author | jdl@freescale.com <jdl@freescale.com> | 2005-09-08 00:59:48 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-09 16:11:35 +0400 |
| commit | dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb (patch) | |
| tree | 59f952b87d4bec5f11c578a384c3aaa2ddf5860d /include/asm-ppc/setup.h | |
| parent | 64807081e38703617cf9a5d71db14ea2b3e1cb04 (diff) | |
| download | linux-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.tar.xz | |
[PATCH] powerpc: Merge a few more include files
Merge a few asm-ppc and asm-ppc64 header files.
Note: the merge of setup.h intentionally does not carry
forward the m68k cruft. That means this patch continues
to break the already broken amiga on the ppc32.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 @@ -#ifdef __KERNEL__ -#ifndef _PPC_SETUP_H -#define _PPC_SETUP_H - -#define m68k_num_memory num_memory -#define m68k_memory memory - -#include <asm-m68k/setup.h> -/* We have a bigger command line buffer. */ -#undef COMMAND_LINE_SIZE -#define COMMAND_LINE_SIZE 512 - -#endif /* _PPC_SETUP_H */ -#endif /* __KERNEL__ */ |