Update of /cvsroot/linuxconsole/ruby/linux/arch/ia64
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/ia64
Modified Files:
config.in
Log Message:
Synced to 2.5.19
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ia64/config.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- config.in 6 May 2002 17:29:59 -0000 1.24
+++ config.in 3 Jun 2002 22:44:55 -0000 1.25
@@ -16,7 +16,7 @@
choice 'IA-64 processor type' \
"Itanium CONFIG_ITANIUM \
- McKinley CONFIG_MCKINLEY" Itanium
+ Itanium-2 CONFIG_MCKINLEY" Itanium
choice 'IA-64 system type' \
"generic CONFIG_IA64_GENERIC \
@@ -26,11 +26,18 @@
SGI-SN1 CONFIG_IA64_SGI_SN1 \
SGI-SN2 CONFIG_IA64_SGI_SN2" generic
-choice 'Kernel page size' \
+if [ "$CONFIG_ITANIUM" = "y" ]; then
+ choice 'Kernel page size' \
+ "4KB CONFIG_IA64_PAGE_SIZE_4KB \
+ 8KB CONFIG_IA64_PAGE_SIZE_8KB \
+ 16KB CONFIG_IA64_PAGE_SIZE_16KB" 16KB
+else
+ choice 'Kernel page size' \
"4KB CONFIG_IA64_PAGE_SIZE_4KB \
8KB CONFIG_IA64_PAGE_SIZE_8KB \
16KB CONFIG_IA64_PAGE_SIZE_16KB \
64KB CONFIG_IA64_PAGE_SIZE_64KB" 16KB
+fi
if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
define_bool CONFIG_ACPI y
|
