diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:13:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:13:40 -0500 |
| commit | 9fc5c3e3237e02a94f41cd1d2b4291593d29791d (patch) | |
| tree | c8823725b10bd4d36e9311ea392dfdecb4db7974 /drivers/platform | |
| parent | 541048a1d31399ccdda27346a37eae4a2ad55186 (diff) | |
| parent | 7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/intel config: Fix the APB_TIMER selection
x86/mrst: Add additional debug prints for pb_keys
x86/intel config: Revamp configuration to allow for Moorestown and Medfield
x86/intel/scu/ipc: Match the changes in the x86 configuration
x86/apb: Fix configuration constraints
x86: Fix INTEL_MID silly
x86/Kconfig: Cyclone-timer depends on x86-summit
x86: Reduce clock calibration time during slave cpu startup
x86/config: Revamp configuration for MID devices
x86/sfi: Kill the IRQ as id hack
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 7f43cf86d776..f995e6e2f78c 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
| @@ -639,7 +639,7 @@ config ACPI_CMPC | |||
| 639 | 639 | ||
| 640 | config INTEL_SCU_IPC | 640 | config INTEL_SCU_IPC |
| 641 | bool "Intel SCU IPC Support" | 641 | bool "Intel SCU IPC Support" |
| 642 | depends on X86_MRST | 642 | depends on X86_INTEL_MID |
| 643 | default y | 643 | default y |
| 644 | ---help--- | 644 | ---help--- |
| 645 | IPC is used to bridge the communications between kernel and SCU on | 645 | IPC is used to bridge the communications between kernel and SCU on |