diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 07:08:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 07:08:16 -0400 |
| commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
| tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /arch/Kconfig | |
| parent | 510b37258dfd61693ca6c039865c78bd996e3718 (diff) | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index ad89a33d8c6e..6093c0be58b0 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -31,6 +31,9 @@ config KRETPROBES | |||
| 31 | def_bool y | 31 | def_bool y |
| 32 | depends on KPROBES && HAVE_KRETPROBES | 32 | depends on KPROBES && HAVE_KRETPROBES |
| 33 | 33 | ||
| 34 | config HAVE_IOREMAP_PROT | ||
| 35 | def_bool n | ||
| 36 | |||
| 34 | config HAVE_KPROBES | 37 | config HAVE_KPROBES |
| 35 | def_bool n | 38 | def_bool n |
| 36 | 39 | ||
| @@ -42,3 +45,10 @@ config HAVE_DMA_ATTRS | |||
| 42 | 45 | ||
| 43 | config USE_GENERIC_SMP_HELPERS | 46 | config USE_GENERIC_SMP_HELPERS |
| 44 | def_bool n | 47 | def_bool n |
| 48 | |||
| 49 | config HAVE_CLK | ||
| 50 | def_bool n | ||
| 51 | help | ||
| 52 | The <linux/clk.h> calls support software clock gating and | ||
| 53 | thus are a key power management tool on many systems. | ||
| 54 | |||