diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-10 10:48:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-10 10:48:11 -0700 |
commit | 2b9bea035a488774b176f14f53160442e8906ad8 (patch) | |
tree | f0d5474f161371d5b9d3960a86bdb0256e9ee8a0 /drivers/platform | |
parent | 016a9f50e28086f70007729017142dedc84e53d1 (diff) | |
parent | fb9caeedafe61599371d057696bff3baef01f455 (diff) | |
download | linux-2b9bea035a488774b176f14f53160442e8906ad8.tar.gz linux-2b9bea035a488774b176f14f53160442e8906ad8.tar.bz2 linux-2b9bea035a488774b176f14f53160442e8906ad8.zip |
Merge tag 'mfd-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD fixes from Lee Jones:
- fix dependency issues on ChromeOS platforms
- fix runtime PM issues on Arizona
- fix IRQ/suspend race on Arizona
* tag 'mfd-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
mfd: Remove MFD_CROS_EC_SPI depends on OF
platform/chrome: Don't make CHROME_PLATFORMS depends on X86 || ARM
mfd: arizona: Fix initialisation of the PM runtime
mfd: arizona: Fix race between runtime suspend and IRQs
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/chrome/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig index cb1329919527..3271cd1abe7c 100644 --- a/drivers/platform/chrome/Kconfig +++ b/drivers/platform/chrome/Kconfig @@ -4,7 +4,6 @@ menuconfig CHROME_PLATFORMS bool "Platform support for Chrome hardware" - depends on X86 || ARM ---help--- Say Y here to get to see options for platform support for various Chromebooks and Chromeboxes. This option alone does |