9 files changed, 20 insertions, 11 deletions
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index a5eeb10cb..5597ec961 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -1,4 +1,5 @@
 menu "Bluetooth"
+depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_MINIPCI
 
 config ADK_KPACKAGE_KMOD_BT
 	prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index a3afafe0c..67198e9c2 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -1,4 +1,5 @@
 menu "Input devices"
+depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT
 
 config ADK_KERNEL_INPUT
 	bool
@@ -23,6 +24,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	depends on ADK_TARGET_USB
 	default n
 
 config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
diff --git a/target/linux/config/Config.in.isdn b/target/linux/config/Config.in.isdn
index 8f6da5ef8..596160e54 100644
--- a/target/linux/config/Config.in.isdn
+++ b/target/linux/config/Config.in.isdn
@@ -1,4 +1,5 @@
 menu "ISDN"
+depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
 
 config ADK_KERNEL_ISDN
 	bool
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds
index 46da9914b..4beeefbe3 100644
--- a/target/linux/config/Config.in.leds
+++ b/target/linux/config/Config.in.leds
@@ -1,4 +1,5 @@
 menu "LEDS driver support"
+depends on ADK_TARGET_WITH_LEDS
 
 config ADK_KERNEL_NEW_LEDS
 	bool
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index f48866460..fd62e69a1 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -7,8 +7,6 @@ config ADK_LINUX_INITRAMFS_BUILTIN
 
 menu "Miscellaneous devices support"
 
-source target/linux/config/Config.in.leds
-
 config ADK_KERNEL_WATCHDOG
 	boolean
 	default n
@@ -23,19 +21,20 @@ config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
 	  from some situations that the hardware watchdog will recover
 	  from. Equally it's a lot cheaper to install.
 
-config ADK_KPACKAGE_KMOD_WD1100
-	prompt "kmod-wd1100....................... Soekris net4801 watchdog"
-	tristate
-	select ADK_KERNEL_WATCHDOG
-	default n
-	help
-	  Driver for the NatSemi SC1x00 series Watchdog
-	  found on Soekris net4801 boards
+#config ADK_KPACKAGE_KMOD_WD1100
+#	prompt "kmod-wd1100....................... Soekris net4801 watchdog"
+#	tristate
+#	select ADK_KERNEL_WATCHDOG
+#	default n
+#	help
+#	  Driver for the NatSemi SC1x00 series Watchdog
+#	  found on Soekris net4801 boards
 
 config ADK_KPACKAGE_KMOD_PARPORT
 	prompt "kmod-parport...................... generic parallel port support"
 	tristate
 	default n
+	depends on ADK_TARGET_WITH_PP
 	help
 	  Kernel module for generic parallel port support
 
@@ -78,6 +77,7 @@ config ADK_KPACKAGE_KMOD_FW_LOADER
 config ADK_KPACKAGE_KMOD_EEPROM_93CX6
 	prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support"
 	tristate
+	depends on ADK_KPACKAGE_KMOD_MAC80211
 	default n
 	help
 
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index 30e6aa293..6c0e91517 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -1,4 +1,5 @@
 menu "Multimedia devices support"
+depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB
 
 config ADK_KERNEL_SND_TIMER
 	boolean
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 64a7af06e..81aecf53e 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -1,5 +1,4 @@
 menu "Network devices support"
-depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241)
 
 config ADK_KERNEL_NETDEVICES
 	boolean
@@ -22,6 +21,7 @@ config ADK_KERNEL_NETDEV_1000
 	default n
 
 menu "Ethernet card support"
+depends on ADK_TARGET_WITH_PCI
 
 config ADK_KPACKAGE_KMOD_NE2K_PCI
 	prompt "kmod-net-ne2k-pci............. NE2000 PCI driver"
@@ -154,6 +154,7 @@ config ADK_MOD_KERNEL_MAC80211
 	default n
 
 menu "Wireless card support"
+depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 
 config ADK_KPACKAGE_KMOD_MAC80211
 	prompt "kmod-mac80211................... mac80211 softmac"
diff --git a/target/linux/config/Config.in.pcmcia b/target/linux/config/Config.in.pcmcia
index 385ede11b..c6aef16bc 100644
--- a/target/linux/config/Config.in.pcmcia
+++ b/target/linux/config/Config.in.pcmcia
@@ -1,4 +1,5 @@
 menu "PCMCIA/CardBus support"
+depends on ADK_TARGET_WITH_CARDBUS
 
 config ADK_KERNEL_CARDBUS
 	boolean 
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 57b2a649f..c9bdb84cf 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,4 +1,5 @@
 menu "USB support"
+depends on ADK_TARGET_WITH_USB
 
 config ADK_KERNEL_USB_DEVICEFS
 	boolean