tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds daf9fe2e 9d85929f

+7 -6
+5 -4
drivers/mfd/Kconfig
··· 11 11 12 12 config MFD_88PM860X 13 13 bool "Support Marvell 88PM8606/88PM8607" 14 - depends on I2C=y 14 + depends on I2C=y && GENERIC_HARDIRQS 15 15 select MFD_CORE 16 16 help 17 17 This supports for Marvell 88PM8606/88PM8607 Power Management IC. ··· 205 205 206 206 config MFD_MAX8925 207 207 bool "Maxim Semiconductor MAX8925 PMIC Support" 208 - depends on I2C=y 208 + depends on I2C=y && GENERIC_HARDIRQS 209 209 select MFD_CORE 210 210 help 211 211 Say yes here to support for Maxim Semiconductor MAX8925. This is ··· 226 226 config MFD_WM831X 227 227 bool "Support Wolfson Microelectronics WM831x/2x PMICs" 228 228 select MFD_CORE 229 - depends on I2C=y 229 + depends on I2C=y && GENERIC_HARDIRQS 230 230 help 231 231 Support for the Wolfson Microelecronics WM831x and WM832x PMICs. 232 232 This driver provides common support for accessing the device, ··· 235 235 236 236 config MFD_WM8350 237 237 bool 238 + depends on GENERIC_HARDIRQS 238 239 239 240 config MFD_WM8350_CONFIG_MODE_0 240 241 bool ··· 288 287 config MFD_WM8350_I2C 289 288 bool "Support Wolfson Microelectronics WM8350 with I2C" 290 289 select MFD_WM8350 291 - depends on I2C=y 290 + depends on I2C=y && GENERIC_HARDIRQS 292 291 help 293 292 The WM8350 is an integrated audio and power management 294 293 subsystem with watchdog and RTC functionality for embedded
+2 -2
drivers/mfd/sm501.c
··· 1430 1430 } 1431 1431 1432 1432 sm->regs_claim = request_mem_region(sm->io_res->start, 1433 - resource_size(sm->io_res), "sm501"); 1433 + 0x100, "sm501"); 1434 1434 1435 1435 if (sm->regs_claim == NULL) { 1436 1436 dev_err(&dev->dev, "cannot claim registers\n"); ··· 1644 1644 sm->mem_res = &dev->resource[0]; 1645 1645 1646 1646 sm->regs_claim = request_mem_region(sm->io_res->start, 1647 - resource_size(sm->io_res), "sm501"); 1647 + 0x100, "sm501"); 1648 1648 if (sm->regs_claim == NULL) { 1649 1649 dev_err(&dev->dev, "cannot claim registers\n"); 1650 1650 err= -EBUSY;