diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-10-25 11:03:48 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-10-25 11:03:48 +0200 |
| commit | 8df5a1ba67b1a4b1560472359c30a5b1e3ebcc78 (patch) | |
| tree | 1563cc6270c76867a8dfe60c7c3d1e57064fed79 /drivers/mfd/lpc_sch.c | |
| parent | 46a99d03f97e54d346a35bb8f0fa79ba73687ad0 (diff) | |
| parent | 6bfd1e63de34a278d67db32e3644340838308252 (diff) | |
| download | linux-8df5a1ba67b1a4b1560472359c30a5b1e3ebcc78.tar.bz2 | |
Merge tag 'mfd-lee-3.13-1' of git://git.linaro.org/people/ljones/mfd
mfd-lee-3.13-1
MFD patches due for v3.13.
Diffstat (limited to 'drivers/mfd/lpc_sch.c')
| -rw-r--r-- | drivers/mfd/lpc_sch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c index 8cc6aac27cb2..fbfbf0b7f97a 100644 --- 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) = { |