diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 17:20:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 17:20:08 -0700 |
| commit | 8556d44fee6ded9f4287d7ff7b5cc9d8635b0be0 (patch) | |
| tree | f74ccc0d0a332f5754bf8c9643a4e7b18d86a12c /arch/x86/Kconfig | |
| parent | ce4747963252a30613ebf1c1df3d83b9526a342e (diff) | |
| parent | 4c51cb005b29e6329d7e598bf835689b230817c9 (diff) | |
| download | linux-8556d44fee6ded9f4287d7ff7b5cc9d8635b0be0.tar.bz2 | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar:
"The main changes in this cycle are:
- Intel SOC driver updates, by Aubrey Li.
- TS5500 platform updates, by Vivien Didelot"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/pmc_atom: Silence shift wrapping warnings in pmc_sleep_tmr_show()
x86/pmc_atom: Expose PMC device state and platform sleep state
x86/pmc_atom: Eisable a few S0ix wake up events for S0ix residency
x86/platform: New Intel Atom SOC power management controller driver
x86/platform/ts5500: Add support for TS-5400 boards
x86/platform/ts5500: Add a 'name' sysfs attribute
x86/platform/ts5500: Use the DEVICE_ATTR_RO() macro
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3fc7d724d0a3..86216a55eb59 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2404,6 +2404,10 @@ config IOSF_MBI default m depends on PCI +config PMC_ATOM + def_bool y + depends on PCI + source "net/Kconfig" source "drivers/Kconfig" |