diff --git a/[refs] b/[refs]
index 9584a98d66cd..5af02a8f2812 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40cd3a4564ed6b7bc0279430120ca0e9b83cf486
+refs/heads/master: 90f7afefaeda946977824617c225b53f0813e357
diff --git a/trunk/arch/powerpc/platforms/pasemi/setup.c b/trunk/arch/powerpc/platforms/pasemi/setup.c
index f88f0ec4c8cb..38bd9037773b 100644
--- a/trunk/arch/powerpc/platforms/pasemi/setup.c
+++ b/trunk/arch/powerpc/platforms/pasemi/setup.c
@@ -211,7 +211,10 @@ static struct of_device_id pasemi_bus_ids[] = {
 
 static int __init pasemi_publish_devices(void)
 {
-	/* Publish OF platform devices for southbridge IOs */
+	if (!machine_is(pasemi))
+		return 0;
+
+	/* Publish OF platform devices for SDC and other non-PCI devices */
 	of_platform_bus_probe(NULL, pasemi_bus_ids, NULL);
 
 	return 0;