fix pcmcia submenu (broken by [8520])

[openwrt.git] / package / kernel / modules / i2c.mk

diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index 4d65b6e..00bd60e 100644 (file)
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -9,47 +9,42 @@
 I2CMENU:=I2C Bus
 
 define KernelPackage/i2c-core
+  SUBMENU:=$(I2CMENU)
   TITLE:=I2C support
   DESCRIPTION:=Kernel modules for i2c support
-  SUBMENU:=$(I2CMENU)
-  KCONFIG:=$(CONFIG_I2C)
-  FILES:=$(MODULES_DIR)/kernel/drivers/i2c/*.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_I2C
+  FILES:=$(LINUX_DIR)/drivers/i2c/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,i2c-core i2c-dev)
 endef
+
 $(eval $(call KernelPackage,i2c-core))
 
+
 define KernelPackage/i2c-algos
+  SUBMENU:=$(I2CMENU)
   TITLE:=I2C algorithms support
   DESCRIPTION:=Kernel modules for various i2c algorithms
   DEPENDS:=kmod-i2c-core
-  SUBMENU:=$(I2CMENU)
-  KCONFIG:=$(CONFIG_I2C_ALGOBIT)
-  FILES:=$(MODULES_DIR)/kernel/drivers/i2c/algos/*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_I2C_ALGOBIT
+  FILES:=$(LINUX_DIR)/drivers/i2c/algos/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,i2c-algo-bit i2c-algo-pcf i2c-algo-pca)
 endef
+
 $(eval $(call KernelPackage,i2c-algos))
 
-define KernelPackage/i2c-au1x00gpio
-  TITLE:=I2C GPIO interface for Au1x00 devices
-  DESCRIPTION:=I2C GPIO interface for Au1x00 devices
-  DEFAULT:=y if LINUX_2_6_AU1000
-  DEPENDS:=kmod-i2c-core kmod-i2c-algos @LINUX_2_6_AU1000
-  SUBMENU:=$(I2CMENU)
-  KCONFIG:=$(CONFIG_I2C_AU1X00GPIO)
-  FILES:=$(MODULES_DIR)/kernel/drivers/i2c/busses/i2c-au1x00gpio.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,70,i2c-au1x00gpio)
-endef
-$(eval $(call KernelPackage,i2c-au1x00gpio))
 
 define KernelPackage/i2c-scx200
+  SUBMENU:=$(I2CMENU)
   TITLE:=SCX200 i2c support
   DESCRIPTION:=Kernel module for SCX200 i2c bus
   DEFAULT:=y if LINUX_2_6_X86_Soekris
   DEPENDS:=kmod-i2c-core kmod-i2c-algos @LINUX_2_6_X86_Soekris
-  SUBMENU:=$(I2CMENU)
-  KCONFIG:=$(CONFIG_I2C_SCX200)
-  FILES:=$(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/drivers/i2c/busses/i2c-isa.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,scx200_i2c)
+  KCONFIG:=CONFIG_SCx200_I2C
+  FILES:= \
+       $(LINUX_DIR)/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/i2c/busses/i2c-isa.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,i2c-isa scx200_i2c)
 endef
+
 $(eval $(call KernelPackage,i2c-scx200))