diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index 11d42e7bcc..e0875982cd 100644
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -53,8 +53,8 @@ $(eval $(call KernelPackage,i2c-algos))
 define KernelPackage/i2c-scx200
   SUBMENU:=$(I2CMENU)
   TITLE:=SCX200 i2c support
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
-  DEPENDS:=kmod-i2c-core kmod-i2c-algos @LINUX_2_6_X86_Soekris
+  DEFAULT:=y if TARGET_x86_Soekris
+  DEPENDS:=@TARGET_x86_Soekris kmod-i2c-core kmod-i2c-algos
   KCONFIG:= \
 	CONFIG_I2C_ISA \
 	CONFIG_SCx200_I2C
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 503c2e05ce..d11a981354 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -387,7 +387,7 @@ NDMENU:=Network Devices
 define KernelPackage/natsemi
   SUBMENU:=$(NDMENU)
   TITLE:=National Semiconductor DP8381x series 
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NATSEMI
   FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
@@ -404,7 +404,7 @@ $(eval $(call KernelPackage,natsemi))
 define KernelPackage/r6040
   SUBMENU:=$(NDMENU)
   TITLE:=RDC Fast-Ethernet support
-  DEPENDS:=@LINUX_2_6_RDC
+  DEPENDS:=@TARGET_rdc
   KCONFIG:=CONFIG_R6040
   FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX)
 endef
@@ -419,7 +419,7 @@ $(eval $(call KernelPackage,r6040))
 define KernelPackage/sis900
   SUBMENU:=$(NDMENU)
   TITLE:=SiS 900 Ethernet support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS900
   FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,sis900)
@@ -435,7 +435,7 @@ $(eval $(call KernelPackage,sis900))
 define KernelPackage/via-rhine
   SUBMENU:=$(NDMENU)
   TITLE:=Via Rhine ethernet support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_VIA_RHINE
   FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,via-rhine)
@@ -451,7 +451,7 @@ $(eval $(call KernelPackage,via-rhine))
 define KernelPackage/via-velocity
   SUBMENU:=$(NDMENU)
   TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
-  DEPENDS:=@LINUX_2_6_IXP4XX
+  DEPENDS:=@TARGET_ixp4xx
   KCONFIG:=CONFIG_VIA_VELOCITY
   FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,via-velocity)
@@ -467,7 +467,7 @@ $(eval $(call KernelPackage,via-velocity))
 define KernelPackage/8139too
   SUBMENU:=$(NDMENU)
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_8139TOO
   FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,8139too)
@@ -483,7 +483,7 @@ $(eval $(call KernelPackage,8139too))
 define KernelPackage/r8169
   SUBMENU:=$(NDMENU)
   TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
-  DEPENDS:=@LINUX_2_6_X86 
+  DEPENDS:=@TARGET_x86 
   KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
   FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,r8169)
@@ -499,7 +499,7 @@ $(eval $(call KernelPackage,r8169))
 define KernelPackage/ne2k-pci
   SUBMENU:=$(NDMENU)
   TITLE:=ne2k-pci Ethernet Adapter kernel support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NE2K_PCI
   FILES:= \
 	$(LINUX_DIR)/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
@@ -517,7 +517,7 @@ $(eval $(call KernelPackage,ne2k-pci))
 define KernelPackage/ixp4xx-npe
   SUBMENU:=$(NDMENU)
   TITLE:=Intel(R) IXP4xx ethernet support
-  DEPENDS:=@LINUX_2_6_IXP4XX
+  DEPENDS:=@TARGET_ixp4xx
   KCONFIG:=CONFIG_IXP4XX_MAC
   FILES:= \
 	$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_npe.$(LINUX_KMOD_SUFFIX) \
@@ -536,7 +536,7 @@ $(eval $(call KernelPackage,ixp4xx-npe))
 define KernelPackage/e100
   SUBMENU:=$(NDMENU)
   TITLE:=Intel(R) PRO/100+ cards kernel support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E100
   FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,e100)
@@ -552,7 +552,7 @@ $(eval $(call KernelPackage,e100))
 define KernelPackage/e1000
   SUBMENU:=$(NDMENU)
   TITLE:=Intel(R) PRO/1000 cards kernel support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E1000
   FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,e1000)
@@ -568,7 +568,7 @@ $(eval $(call KernelPackage,e1000))
 define KernelPackage/3c59x
   SUBMENU:=$(NDMENU)
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_3C59X
   FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,3c59x)
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 0cd869dace..280b5c4aa9 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -360,7 +360,7 @@ $(eval $(call KernelPackage,bluetooth))
 define KernelPackage/mmc
   SUBMENU:=$(EMENU)
   TITLE:=MMC/SD Card Support
-  DEPENDS:=@LINUX_2_6_AT91
+  DEPENDS:=@TARGET_at91
   KCONFIG:= \
 	CONFIG_MMC \
 	CONFIG_MMC_BLOCK \
@@ -436,7 +436,7 @@ $(eval $(call KernelPackage,videodev))
 define KernelPackage/leds-net48xx
   SUBMENU:=$(EMENU)
   TITLE:=Soekris Net48xx LED support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_LEDS_NET48XX
   FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
@@ -452,7 +452,7 @@ $(eval $(call KernelPackage,leds-net48xx))
 define KernelPackage/nsc-gpio
   SUBMENU:=$(EMENU)
   TITLE:=Natsemi GPIO support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NSC_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
@@ -468,7 +468,7 @@ $(eval $(call KernelPackage,nsc-gpio))
 define KernelPackage/scx200-gpio
   SUBMENU:=$(EMENU)
   TITLE:=Natsemi SCX200 GPIO support
-  DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86 kmod-nsc-gpio
   KCONFIG:=CONFIG_SCx200_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
@@ -484,7 +484,7 @@ $(eval $(call KernelPackage,scx200-gpio))
 define KernelPackage/scx200-wdt
   SUBMENU:=$(EMENU)
   TITLE:=Natsemi SCX200 Watchdog support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SC1200_WDT
   FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index dfcaccd0a9..1f426c46d9 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -121,7 +121,7 @@ $(eval $(call KernelPackage,usb-ohci))
 
 
 define KernelPackage/usb-adm5120
-  $(call usbdep,@LINUX_2_6_ADM5120||@LINUX_2_6_ADM5120EB)
+  $(call usbdep,@TARGET_adm5120_router_be||@TARGET_adm5120_router_le)
   TITLE:=Support for the ADM5120 HCD controller
   KCONFIG:=CONFIG_USB_ADM5120_HCD
   FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX)