summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/bootx.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
commit012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch)
tree87efc733f9b164e8c85c0336f92c8fb7eff6d183 /include/asm-ppc/bootx.h
parent625a1589d3d6464b5d90b8a0918789e3afffd220 (diff)
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem.
Diffstat (limited to 'include/asm-ppc/bootx.h')
-rw-r--r--include/asm-ppc/bootx.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ppc/bootx.h b/include/asm-ppc/bootx.h
index 5674bd0f9..90c79cdb7 100644
--- a/include/asm-ppc/bootx.h
+++ b/include/asm-ppc/bootx.h
@@ -133,4 +133,3 @@ typedef struct boot_infos
#endif
#endif
- \ No newline at end of file