Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2010-03-12 16:41:09 -08:00
commit daf9fe2ee9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mfd/Kconfig
View File

@ -11,7 +11,7 @@ config MFD_CORE
config MFD_88PM860X
bool "Support Marvell 88PM8606/88PM8607"
depends on I2C=y
depends on I2C=y && GENERIC_HARDIRQS
select MFD_CORE
help
This supports for Marvell 88PM8606/88PM8607 Power Management IC.
@ -205,7 +205,7 @@ config PMIC_ADP5520
config MFD_MAX8925
bool "Maxim Semiconductor MAX8925 PMIC Support"
depends on I2C=y
depends on I2C=y && GENERIC_HARDIRQS
select MFD_CORE
help
Say yes here to support for Maxim Semiconductor MAX8925. This is
@ -226,7 +226,7 @@ config MFD_WM8400
config MFD_WM831X
bool "Support Wolfson Microelectronics WM831x/2x PMICs"
select MFD_CORE
depends on I2C=y
depends on I2C=y && GENERIC_HARDIRQS
help
Support for the Wolfson Microelecronics WM831x and WM832x PMICs.
This driver provides common support for accessing the device,
@ -235,6 +235,7 @@ config MFD_WM831X
config MFD_WM8350
bool
depends on GENERIC_HARDIRQS
config MFD_WM8350_CONFIG_MODE_0
bool
@ -287,7 +288,7 @@ config MFD_WM8352_CONFIG_MODE_3
config MFD_WM8350_I2C
bool "Support Wolfson Microelectronics WM8350 with I2C"
select MFD_WM8350
depends on I2C=y
depends on I2C=y && GENERIC_HARDIRQS
help
The WM8350 is an integrated audio and power management
subsystem with watchdog and RTC functionality for embedded

4
drivers/mfd/sm501.c
View File

@ -1430,7 +1430,7 @@ static int __devinit sm501_plat_probe(struct platform_device *dev)
}
sm->regs_claim = request_mem_region(sm->io_res->start,
resource_size(sm->io_res), "sm501");
0x100, "sm501");
if (sm->regs_claim == NULL) {
dev_err(&dev->dev, "cannot claim registers\n");
@ -1644,7 +1644,7 @@ static int __devinit sm501_pci_probe(struct pci_dev *dev,
sm->mem_res = &dev->resource[0];
sm->regs_claim = request_mem_region(sm->io_res->start,
resource_size(sm->io_res), "sm501");
0x100, "sm501");
if (sm->regs_claim == NULL) {
dev_err(&dev->dev, "cannot claim registers\n");
err= -EBUSY;