diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /arch/ia64/Kconfig | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 48e496fe1e75..912c57db2d21 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -7,6 +7,8 @@ mainmenu "IA-64 Linux Kernel Configuration" | |||
| 7 | 7 | ||
| 8 | source "init/Kconfig" | 8 | source "init/Kconfig" |
| 9 | 9 | ||
| 10 | source "kernel/Kconfig.freezer" | ||
| 11 | |||
| 10 | menu "Processor type and features" | 12 | menu "Processor type and features" |
| 11 | 13 | ||
| 12 | config IA64 | 14 | config IA64 |
| @@ -60,14 +62,6 @@ config RWSEM_XCHGADD_ALGORITHM | |||
| 60 | bool | 62 | bool |
| 61 | default y | 63 | default y |
| 62 | 64 | ||
| 63 | config ARCH_HAS_ILOG2_U32 | ||
| 64 | bool | ||
| 65 | default n | ||
| 66 | |||
| 67 | config ARCH_HAS_ILOG2_U64 | ||
| 68 | bool | ||
| 69 | default n | ||
| 70 | |||
| 71 | config HUGETLB_PAGE_SIZE_VARIABLE | 65 | config HUGETLB_PAGE_SIZE_VARIABLE |
| 72 | bool | 66 | bool |
| 73 | depends on HUGETLB_PAGE | 67 | depends on HUGETLB_PAGE |