diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /arch/cris/Kconfig | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'arch/cris/Kconfig')
| -rw-r--r-- | arch/cris/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 856b665020e7..6a1238a29d6c 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -28,6 +28,10 @@ config GENERIC_CALIBRATE_DELAY | |||
| 28 | bool | 28 | bool |
| 29 | default y | 29 | default y |
| 30 | 30 | ||
| 31 | config IRQ_PER_CPU | ||
| 32 | bool | ||
| 33 | default y | ||
| 34 | |||
| 31 | config CRIS | 35 | config CRIS |
| 32 | bool | 36 | bool |
| 33 | default y | 37 | default y |