Merge remote-tracking branch 'tegra/for-next'

[karo-tx-linux.git] / drivers / mfd / lpc_sch.c

diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c
index 8cc6aac27cb2d5ef77b0c7894dc9670afcfae4a8..fbfbf0b7f97ac1cfad5d8964a7436fa05122a89f 100644 (file)
--- a/drivers/mfd/lpc_sch.c
+++ b/drivers/mfd/lpc_sch.c
@@ -59,18 +59,21 @@ static struct mfd_cell isch_smbus_cell = {
        .name = "isch_smbus",
        .num_resources = 1,
        .resources = &smbus_sch_resource,
+       .ignore_resource_conflicts = true,
 };
 
 static struct mfd_cell sch_gpio_cell = {
        .name = "sch_gpio",
        .num_resources = 1,
        .resources = &gpio_sch_resource,
+       .ignore_resource_conflicts = true,
 };
 
 static struct mfd_cell wdt_sch_cell = {
        .name = "ie6xx_wdt",
        .num_resources = 1,
        .resources = &wdt_sch_resource,
+       .ignore_resource_conflicts = true,
 };
 
 static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = {