diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 22:22:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 22:22:56 -0400 |
| commit | 5f48b338cd28f4095697a174d7e3e72084aca893 (patch) | |
| tree | 3e425801e8da2ffdfd6a88c3f494032bc512a5fa /arch/sparc64/Kconfig | |
| parent | f09cc910fe3af7e63298105bc0482653eb534c3c (diff) | |
| parent | 29f139ce27c7e64a3e8575afa8deb46cde09db0a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: ARRAY_SIZE() cleanup
[SPARC64]: small Makefile cleanups
[SPARC64]: Stop using __do_IRQ().
[SPARC64]: Update defconfig.
Diffstat (limited to 'arch/sparc64/Kconfig')
| -rw-r--r-- | arch/sparc64/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index c7a74e376985..03c4e5c1b94a 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -72,6 +72,10 @@ config ARCH_NO_VIRT_TO_BUS | |||
| 72 | config OF | 72 | config OF |
| 73 | def_bool y | 73 | def_bool y |
| 74 | 74 | ||
| 75 | config GENERIC_HARDIRQS_NO__DO_IRQ | ||
| 76 | bool | ||
| 77 | def_bool y | ||
| 78 | |||
| 75 | choice | 79 | choice |
| 76 | prompt "Kernel page size" | 80 | prompt "Kernel page size" |
| 77 | default SPARC64_PAGE_SIZE_8KB | 81 | default SPARC64_PAGE_SIZE_8KB |