---

yaml --- r: 234927 b: refs/heads/master c: 9079b35 h: refs/heads/master i: 234925: 96f605b 234923: a9c2989 234919: 9d0d4d3 234911: 72ea904 v: v3
git-mirror · Feb 23, 2011 · 368e247 · 368e247
1 parent 169a4c2
commit 368e247
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96e0a0797eba35b5420c710b928f19094b2d5c45
+refs/heads/master: 9079b35364e75ce6b968a179f861d2f819f33e61
diff --git a/trunk/arch/x86/kernel/devicetree.c b/trunk/arch/x86/kernel/devicetree.c
@@ -103,6 +103,25 @@ void __init add_dtb(u64 data)
 	initial_dtb = data + offsetof(struct setup_data, data);
 }
 
+/*
+ * CE4100 ids. Will be moved to machine_device_initcall() once we have it.
+ */
+static struct of_device_id __initdata ce4100_ids[] = {
+	{ .compatible = "intel,ce4100-cp", },
+	{ .compatible = "isa", },
+	{ .compatible = "pci", },
+	{},
+};
+
+static int __init add_bus_probe(void)
+{
+	if (!initial_boot_params)
+		return 0;
+
+	return of_platform_bus_probe(NULL, ce4100_ids, NULL);
+}
+module_init(add_bus_probe);
+
 #ifdef CONFIG_PCI
 static int x86_of_pci_irq_enable(struct pci_dev *dev)
 {