patch-2.4.21 linux-2.4.21/arch/x86_64/config.in

Next file: linux-2.4.21/arch/x86_64/defconfig
Previous file: linux-2.4.21/arch/x86_64/boot/setup.S
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/arch/x86_64/config.in linux-2.4.21/arch/x86_64/config.in
@@ -95,6 +95,7 @@
    source drivers/hotplug/Config.in
 else
    define_bool CONFIG_PCMCIA n
+   define_bool CONFIG_HOTPLUG_PCI n
 fi
 
 bool 'System V IPC' CONFIG_SYSVIPC
@@ -199,9 +200,8 @@
 source drivers/input/Config.in
 source drivers/char/Config.in
 
-source net/bluetooth/Config.in
 
-source drivers/misc/Config.in
+#source drivers/misc/Config.in
 
 source drivers/media/Config.in
 
@@ -230,6 +230,8 @@
 
 source drivers/usb/Config.in
 
+source net/bluetooth/Config.in
+
 mainmenu_option next_comment
 comment 'Kernel hacking'
 
@@ -241,7 +243,10 @@
    bool '  Spinlock debugging' CONFIG_DEBUG_SPINLOCK
    bool '  Additional run-time checks' CONFIG_CHECKING
    bool '  Debug __init statements' CONFIG_INIT_DEBUG
+   bool '  IOMMU debugging' CONFIG_IOMMU_DEBUG
    bool '  IOMMU leak tracing' CONFIG_IOMMU_LEAK
    bool '  Probalistic stack overflow check' CONFIG_DEBUG_STACKOVERFLOW
 fi
 endmenu
+
+source lib/Config.in

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)