diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 17:27:13 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 17:27:13 -0400 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /arch/sh/Kconfig | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index adc8109f8b77..3e804c736e64 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -37,6 +37,10 @@ config GENERIC_CALIBRATE_DELAY | |||
| 37 | bool | 37 | bool |
| 38 | default y | 38 | default y |
| 39 | 39 | ||
| 40 | config ARCH_MAY_HAVE_PC_FDC | ||
| 41 | bool | ||
| 42 | default y | ||
| 43 | |||
| 40 | source "init/Kconfig" | 44 | source "init/Kconfig" |
| 41 | 45 | ||
| 42 | menu "System type" | 46 | menu "System type" |