diff --git a/package/gpioctl/Makefile b/package/gpioctl/Makefile
index dd8f167a45..be684f11fa 100644
--- a/package/gpioctl/Makefile
+++ b/package/gpioctl/Makefile
@@ -19,7 +19,7 @@ define Package/gpioctl
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Tool for controlling gpio pins
-  DEPENDS:=@LINUX_2_6&&(@TARGET_ixp4xx||@TARGET_brcm47xx||@TARGET_atheros||@TARGET_adm5120)
+  DEPENDS:=@GPIO_SUPPORT
 endef
 
 define Package/gpioctl/description
diff --git a/package/mmc_over_gpio/Makefile b/package/mmc_over_gpio/Makefile
index 42c666cd3c..abf89379f3 100644
--- a/package/mmc_over_gpio/Makefile
+++ b/package/mmc_over_gpio/Makefile
@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/mmc-over-gpio
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6 +kmod-mmc-spi +kmod-spi-gpio @!TARGET_x86
+  DEPENDS:=@GPIO_SUPPORT +kmod-mmc-spi +kmod-spi-gpio
   TITLE:=MMC/SD card over GPIO support
   FILES:=$(PKG_BUILD_DIR)/mmc_over_spigpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,93,spi_gpio mmc_over_spigpio)