[lc-checkins] CVS: linux/arch/i386 config.in,1.8,1.9

[Rodrigo S. de C. <rc...@us...>]

Update of /cvsroot/linuxcompressed/linux/arch/i386
In directory usw-pr-cvs1:/tmp/cvs-serv17791/arch/i386

Modified Files:
	config.in 
Log Message:
- 0.20pre2 version updated from 2.4.10 to 2.4.16.

- Code was rewritten in swapfile.c to work with the new swap file functions
(swap_free, swap_duplicate, swap_info_get, swap_info_put, etc).



Index: config.in
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/arch/i386/config.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** config.in	2001/10/01 22:43:59	1.8
--- config.in	2001/12/12 20:45:45	1.9
***************
*** 150,153 ****
--- 150,154 ----
  fi
  tristate 'Toshiba Laptop support' CONFIG_TOSHIBA
+ tristate 'Dell Inspiron 8000 support' CONFIG_I8K
  
  tristate '/dev/cpu/microcode - Intel IA32 CPU microcode support' CONFIG_MICROCODE
***************
*** 171,179 ****
  bool 'Symmetric multi-processing support' CONFIG_SMP
  if [ "$CONFIG_SMP" != "y" ]; then
!    bool 'APIC and IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC
     if [ "$CONFIG_X86_UP_IOAPIC" = "y" ]; then
        define_bool CONFIG_X86_IO_APIC y
-       define_bool CONFIG_X86_LOCAL_APIC y
     fi
  fi
  
--- 172,185 ----
  bool 'Symmetric multi-processing support' CONFIG_SMP
  if [ "$CONFIG_SMP" != "y" ]; then
!    bool 'Local APIC support on uniprocessors' CONFIG_X86_UP_APIC
!    dep_bool 'IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC $CONFIG_X86_UP_APIC
!    if [ "$CONFIG_X86_UP_APIC" = "y" ]; then
!       define_bool CONFIG_X86_LOCAL_APIC y
!    fi
     if [ "$CONFIG_X86_UP_IOAPIC" = "y" ]; then
        define_bool CONFIG_X86_IO_APIC y
     fi
+ else
+    bool 'Multiquad NUMA system' CONFIG_MULTIQUAD
  fi
  
***************
*** 191,194 ****
--- 197,201 ----
  	int 'Compressed Cache Size (Memory Pages)' CONFIG_COMP_CACHE_SIZE 512
  fi
+ 
  bool 'Networking support' CONFIG_NET
  
***************
*** 234,239 ****
--- 241,248 ----
  if [ "$CONFIG_HOTPLUG" = "y" ] ; then
     source drivers/pcmcia/Config.in
+    source drivers/hotplug/Config.in
  else
     define_bool CONFIG_PCMCIA n
+    define_bool CONFIG_HOTPLUG_PCI n
  fi
  
***************
*** 316,320 ****
  source drivers/ieee1394/Config.in
  
! source drivers/i2o/Config.in
  
  if [ "$CONFIG_NET" = "y" ]; then
--- 325,329 ----
  source drivers/ieee1394/Config.in
  
! source drivers/message/i2o/Config.in
  
  if [ "$CONFIG_NET" = "y" ]; then
***************
*** 399,402 ****
--- 408,412 ----
  bool 'Kernel debugging' CONFIG_DEBUG_KERNEL
  if [ "$CONFIG_DEBUG_KERNEL" != "n" ]; then
+    bool '  Debug high memory support' CONFIG_DEBUG_HIGHMEM
     bool '  Debug memory allocations' CONFIG_DEBUG_SLAB
     bool '  Memory mapped I/O debugging' CONFIG_DEBUG_IOVIRT