diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:41:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:41:09 -0500 |
commit | daf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c (patch) | |
tree | 18e5384b5cb170e5962f449afc89605ef5e65ea1 /drivers/mfd/sm501.c | |
parent | 9d85929fefd040ca84a5e04ee704d043efcc3c2e (diff) | |
parent | 8d002bdc9f1f9a1220c0d87a7321f0233ace97cd (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Several MFD drivers should depend on GENERIC_HARDIRQS
mfd: Fix sm501 requested region size
Diffstat (limited to 'drivers/mfd/sm501.c')
-rw-r--r-- | drivers/mfd/sm501.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index ff0718efb0ae..7b6652f60117 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c | |||
@@ -1430,7 +1430,7 @@ static int __devinit sm501_plat_probe(struct platform_device *dev) | |||
1430 | } | 1430 | } |
1431 | 1431 | ||
1432 | sm->regs_claim = request_mem_region(sm->io_res->start, | 1432 | sm->regs_claim = request_mem_region(sm->io_res->start, |
1433 | resource_size(sm->io_res), "sm501"); | 1433 | 0x100, "sm501"); |
1434 | 1434 | ||
1435 | if (sm->regs_claim == NULL) { | 1435 | if (sm->regs_claim == NULL) { |
1436 | dev_err(&dev->dev, "cannot claim registers\n"); | 1436 | dev_err(&dev->dev, "cannot claim registers\n"); |
@@ -1644,7 +1644,7 @@ static int __devinit sm501_pci_probe(struct pci_dev *dev, | |||
1644 | sm->mem_res = &dev->resource[0]; | 1644 | sm->mem_res = &dev->resource[0]; |
1645 | 1645 | ||
1646 | sm->regs_claim = request_mem_region(sm->io_res->start, | 1646 | sm->regs_claim = request_mem_region(sm->io_res->start, |
1647 | resource_size(sm->io_res), "sm501"); | 1647 | 0x100, "sm501"); |
1648 | if (sm->regs_claim == NULL) { | 1648 | if (sm->regs_claim == NULL) { |
1649 | dev_err(&dev->dev, "cannot claim registers\n"); | 1649 | dev_err(&dev->dev, "cannot claim registers\n"); |
1650 | err= -EBUSY; | 1650 | err= -EBUSY; |