diff --git a/[refs] b/[refs]
index e66c0529c577..e575758947e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f2384c4bdd4be3dc1e5d22ed5e6f0c3076fda60
+refs/heads/master: 1effe5bc6cfbac4506d7944d68dadbd29ad62645
diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c
index c70e7a5a5a90..dfee0a2ba167 100644
--- a/trunk/drivers/mfd/asic3.c
+++ b/trunk/drivers/mfd/asic3.c
@@ -604,14 +604,6 @@ static int asic3_probe(struct platform_device *pdev)
 		goto out_irq;
 	}
 
-	if (pdata->children) {
-		int i;
-		for (i = 0; i < pdata->n_children; i++) {
-			pdata->children[i]->dev.parent = &pdev->dev;
-			platform_device_register(pdata->children[i]);
-		}
-	}
-
 	printk(KERN_INFO "ASIC3 Core driver\n");
 
 	return 0;
diff --git a/trunk/include/linux/mfd/asic3.h b/trunk/include/linux/mfd/asic3.h
index 06ef8165f406..b1c365800ab5 100644
--- a/trunk/include/linux/mfd/asic3.h
+++ b/trunk/include/linux/mfd/asic3.h
@@ -32,9 +32,6 @@ struct asic3_platform_data {
 	unsigned int irq_base;
 
 	unsigned int gpio_base;
-
-	struct platform_device **children;
-	unsigned int n_children;
 };
 
 #define ASIC3_NUM_GPIO_BANKS	4