linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ia64 / kernel / machvec.c

diff --git a/arch/ia64/kernel/machvec.c b/arch/ia64/kernel/machvec.c
index d4a546a..c3a04ee 100644 (file)
--- a/arch/ia64/kernel/machvec.c
+++ b/arch/ia64/kernel/machvec.c
@@ -1,3 +1,4 @@
+#include <linux/config.h>
 #include <linux/module.h>
 
 #include <asm/machvec.h>
@@ -13,15 +14,7 @@
 struct ia64_machine_vector ia64_mv;
 EXPORT_SYMBOL(ia64_mv);
 
-static __initdata const char *mvec_name;
-static __init int setup_mvec(char *s)
-{
-       mvec_name = s;
-       return 0;
-}
-early_param("machvec", setup_mvec);
-
-static struct ia64_machine_vector * __init
+static struct ia64_machine_vector *
 lookup_machvec (const char *name)
 {
        extern struct ia64_machine_vector machvec_start[];
@@ -40,13 +33,10 @@ machvec_init (const char *name)
 {
        struct ia64_machine_vector *mv;
 
-       if (!name)
-               name = mvec_name ? mvec_name : acpi_get_sysname();
        mv = lookup_machvec(name);
-       if (!mv)
-               panic("generic kernel failed to find machine vector for"
-                     " platform %s!", name);
-
+       if (!mv) {
+               panic("generic kernel failed to find machine vector for platform %s!", name);
+       }
        ia64_mv = *mv;
        printk(KERN_INFO "booting generic kernel on platform %s\n", name);
 }