diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-07-17 21:16:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 17:24:40 -0700 |
| commit | 635c0a217425f6f37422b85bcc88a7af9efc457c (patch) | |
| tree | 0bb2e9b60e6a4c201a545b2c1d4def320731528b /arch | |
| parent | a594409a2160070b2185e77b33232cf73a9151a5 (diff) | |
| download | kernel-crypto-635c0a217425f6f37422b85bcc88a7af9efc457c.tar.gz kernel-crypto-635c0a217425f6f37422b85bcc88a7af9efc457c.tar.xz kernel-crypto-635c0a217425f6f37422b85bcc88a7af9efc457c.zip | |
m68k/apollo: Add missing call to apollo_parse_bootinfo()
Add the missing call to apollo_parse_bootinfo(), which had been lost from a
big Apollo support patch by Peter De Schrijver in 1999.
Thanks to Adrian Bunk for noticing!
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/kernel/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index b1f39e4cedb..ea1e44da19b 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c @@ -122,6 +122,7 @@ extern int bvme6000_parse_bootinfo(const struct bi_record *); extern int mvme16x_parse_bootinfo(const struct bi_record *); extern int mvme147_parse_bootinfo(const struct bi_record *); extern int hp300_parse_bootinfo(const struct bi_record *); +extern int apollo_parse_bootinfo(const struct bi_record *); extern void config_amiga(void); extern void config_atari(void); @@ -189,6 +190,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) unknown = mvme147_parse_bootinfo(record); else if (MACH_IS_HP300) unknown = hp300_parse_bootinfo(record); + else if (MACH_IS_APOLLO) + unknown = apollo_parse_bootinfo(record); else unknown = 1; } |