diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 00:07:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 00:07:59 -0400 |
| commit | 16c29dafcc86024048f1dbb8349d31cb22c7c55a (patch) | |
| tree | 100c4fd34903adf02c9b8ae7705a3e1f30c8d712 /arch/x86/Kconfig | |
| parent | dc50eddb2f3a0dff365f093b2a93fb4ab4dd4389 (diff) | |
| parent | d47d81c0e9abdc3c88653fabff5beae82c949b09 (diff) | |
Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
Introduce ARCH_NO_SYSDEV_OPS config option (v2)
cpufreq: Use syscore_ops for boot CPU suspend/resume (v2)
KVM: Use syscore_ops instead of sysdev class and sysdev
PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev
timekeeping: Use syscore_ops instead of sysdev class and sysdev
x86: Use syscore_ops instead of sysdev classes and sysdevs
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 140e254fe546..cc6c53a95bfd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -71,6 +71,7 @@ config X86 | |||
| 71 | select GENERIC_IRQ_SHOW | 71 | select GENERIC_IRQ_SHOW |
| 72 | select IRQ_FORCED_THREADING | 72 | select IRQ_FORCED_THREADING |
| 73 | select USE_GENERIC_SMP_HELPERS if SMP | 73 | select USE_GENERIC_SMP_HELPERS if SMP |
| 74 | select ARCH_NO_SYSDEV_OPS | ||
| 74 | 75 | ||
| 75 | config INSTRUCTION_DECODER | 76 | config INSTRUCTION_DECODER |
| 76 | def_bool (KPROBES || PERF_EVENTS) | 77 | def_bool (KPROBES || PERF_EVENTS) |