Merge branch 'master' into gfs2

[pandora-kernel.git] / arch / sh / boards / unknown / setup.c

diff --git a/arch/sh/boards/unknown/setup.c b/arch/sh/boards/unknown/setup.c
index 02e84f0..1c94137 100644 (file)
--- a/arch/sh/boards/unknown/setup.c
+++ b/arch/sh/boards/unknown/setup.c
@@ -12,22 +12,10 @@
  * method to start debugging a new board during bring-up until proper board
  * setup code is written.
  */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <asm/machvec.h>
-#include <asm/irq.h>
 
 struct sh_machine_vector mv_unknown __initmv = {
-       .mv_nr_irqs             = NR_IRQS,
+       .mv_name                = "Unknown",
 };
 ALIAS_MV(unknown)
-
-const char *get_system_type(void)
-{
-       return "Unknown";
-}
-
-void __init platform_setup(void)
-{
-}
-