Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

[palacios.git] / palacios / src / devices / Kconfig

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 8d62f77..456d717 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -3,7 +3,7 @@ menu "Virtual Devices"
 config APIC
        bool "APIC" 
        default y
-       depends on ICC_BUS && EXPERIMENTAL
+       depends on EXPERIMENTAL
        help 
          Includes the Virtual APIC device
 
@@ -19,7 +19,7 @@ config DEBUG_APIC
 
 config IO_APIC
        bool "IOAPIC"
-       depends on ICC_BUS && EXPERIMENTAL
+       depends on EXPERIMENTAL
        default y
        help 
          Includes the Virtual IO APIC
@@ -32,20 +32,6 @@ config DEBUG_IO_APIC
          Enable debugging for the IO APIC
 
 
-config ICC_BUS
-       bool "ICC BUS"
-       default y
-       depends on EXPERIMENTAL
-       help 
-         The ICC Bus for APIC/IOAPIC communication
-
-config DEBUG_ICC_BUS
-       bool "ICC BUS Debugging"
-       default n
-       depends on ICC_BUS && DEBUG_ON
-       help
-         Enable debugging for the ICC BUS
-
 
 config BOCHS_DEBUG
        bool "Bochs Debug Console Device"