Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / arch / powerpc / platforms / 85xx / tqm85xx.c

diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 2a08b315e190667dca89b135cc88adde2e3bb979..77681acf1bae1474ec64e5335d1b4cde7e2ff33c 100644 (file)
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -146,10 +146,6 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m)
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
-       { .name = "soc", },
-       { .type = "soc", },
-       { .name = "cpm", },
-       { .name = "localbus", },
        { .compatible = "simple-bus", },
        {},
 };