diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/mfd/tc6387xb.c | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/mfd/tc6387xb.c')
-rw-r--r-- | drivers/mfd/tc6387xb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c index 6315f63f017d..ad715bf49cac 100644 --- a/drivers/mfd/tc6387xb.c +++ b/drivers/mfd/tc6387xb.c | |||
@@ -131,7 +131,8 @@ static struct mfd_cell tc6387xb_cells[] = { | |||
131 | .name = "tmio-mmc", | 131 | .name = "tmio-mmc", |
132 | .enable = tc6387xb_mmc_enable, | 132 | .enable = tc6387xb_mmc_enable, |
133 | .disable = tc6387xb_mmc_disable, | 133 | .disable = tc6387xb_mmc_disable, |
134 | .driver_data = &tc6387xb_mmc_data, | 134 | .platform_data = &tc6387xb_mmc_data, |
135 | .pdata_size = sizeof(tc6387xb_mmc_data), | ||
135 | .num_resources = ARRAY_SIZE(tc6387xb_mmc_resources), | 136 | .num_resources = ARRAY_SIZE(tc6387xb_mmc_resources), |
136 | .resources = tc6387xb_mmc_resources, | 137 | .resources = tc6387xb_mmc_resources, |
137 | }, | 138 | }, |
@@ -190,11 +191,6 @@ static int __devinit tc6387xb_probe(struct platform_device *dev) | |||
190 | 191 | ||
191 | printk(KERN_INFO "Toshiba tc6387xb initialised\n"); | 192 | printk(KERN_INFO "Toshiba tc6387xb initialised\n"); |
192 | 193 | ||
193 | tc6387xb_cells[TC6387XB_CELL_MMC].platform_data = | ||
194 | &tc6387xb_cells[TC6387XB_CELL_MMC]; | ||
195 | tc6387xb_cells[TC6387XB_CELL_MMC].data_size = | ||
196 | sizeof(tc6387xb_cells[TC6387XB_CELL_MMC]); | ||
197 | |||
198 | ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells, | 194 | ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells, |
199 | ARRAY_SIZE(tc6387xb_cells), iomem, irq); | 195 | ARRAY_SIZE(tc6387xb_cells), iomem, irq); |
200 | 196 | ||