diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index 0eb8a07a8..aeaac5c36 100644
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -52,151 +52,6 @@ endef
 
 $(eval $(call KernelPackage,i2c-algo-bit))
 
-
-I2C_ALGOPCA_MODULES:= \
-  CONFIG_I2C_ALGOPCA:drivers/i2c/algos/i2c-algo-pca
-
-define KernelPackage/i2c-algo-pca
-  $(call i2c_defaults,$(I2C_ALGOPCA_MODULES),55)
-  TITLE:=I2C PCA 9564 interfaces
-  DEPENDS:=kmod-i2c-core
-endef
-
-define KernelPackage/i2c-algo-pca/description
- Kernel modules for I2C PCA 9564 interfaces.
-endef
-
-$(eval $(call KernelPackage,i2c-algo-pca))
-
-
-I2C_ALGOPCF_MODULES:= \
-  CONFIG_I2C_ALGOPCF:drivers/i2c/algos/i2c-algo-pcf
-
-define KernelPackage/i2c-algo-pcf
-  $(call i2c_defaults,$(I2C_ALGOPCF_MODULES),55)
-  TITLE:=I2C PCF 8584 interfaces
-  DEPENDS:=kmod-i2c-core
-endef
-
-define KernelPackage/i2c-algo-pcf/description
- Kernel modules for I2C PCF 8584 interfaces
-endef
-
-$(eval $(call KernelPackage,i2c-algo-pcf))
-
-
-I2C_GPIO_MODULES:= \
-  CONFIG_I2C_GPIO:drivers/i2c/busses/i2c-gpio
-
-define KernelPackage/i2c-gpio
-  $(call i2c_defaults,$(I2C_GPIO_MODULES),59)
-  TITLE:=GPIO-based bitbanging I2C
-  DEPENDS:=@GPIO_SUPPORT +kmod-i2c-algo-bit
-endef
-
-define KernelPackage/i2c-gpio/description
- Kernel modules for a very simple bitbanging I2C driver utilizing the
- arch-neutral GPIO API to control the SCL and SDA lines.
-endef
-
-$(eval $(call KernelPackage,i2c-gpio))
-
-
-OF_I2C_MODULES:=\
-  CONFIG_OF_I2C:drivers/of/of_i2c
-
-define KernelPackage/of-i2c
-  $(call i2c_defaults,$(OF_I2C_MODULES),58)
-  TITLE:=OpenFirmware I2C accessors
-  DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx||TARGET_mpc52xx||TARGET_mpc83xx||TARGET_mpc85xx \
-          kmod-i2c-core
-endef
-
-define KernelPackage/of-i2c/description
- Kernel module for OpenFirmware I2C accessors.
-endef
-
-$(eval $(call KernelPackage,of-i2c))
-
-I2C_MPC_MODULES:=\
-  CONFIG_I2C_MPC:drivers/i2c/busses/i2c-mpc
-
-define KernelPackage/i2c-mpc
-  $(call i2c_defaults,$(I2C_MPC_MODULES),59)
-  TITLE:=MPC I2C accessors
-  DEPENDS:=@TARGET_mpc52xx||TARGET_mpc83xx||TARGET_mpc85xx \
-          +kmod-i2c-core +kmod-of-i2c
-endef
-
-define KernelPackage/i2c-mpc/description
- Kernel module for Freescale MPC52xx MPC83xx MPC85xx I2C accessors.
-endef
-
-$(eval $(call KernelPackage,i2c-mpc))
-
-I2C_IBM_IIC_MODULES:=\
-  CONFIG_I2C_IBM_IIC:drivers/i2c/busses/i2c-ibm_iic
-
-define KernelPackage/i2c-ibm-iic
-  $(call i2c_defaults,$(OF_I2C_MODULES),59)
-  TITLE:=IBM PPC 4xx on-chip I2C interface support
-  DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx +kmod-i2c-core +kmod-of-i2c
-endef
-
-define KernelPackage/i2c-ibm-iic/description
- Kernel module for IIC peripheral found on embedded IBM PPC4xx based systems.
-endef
-
-$(eval $(call KernelPackage,i2c-ibm-iic))
-
-I2C_MV64XXX_MODULES:=\
-  CONFIG_I2C_MV64XXX:drivers/i2c/busses/i2c-mv64xxx
-
-define KernelPackage/i2c-mv64xxx
-  $(call i2c_defaults,$(I2C_MV64XXX_MODULES),59)
-  TITLE:=Orion Platform I2C interface support
-  DEPENDS:=@TARGET_kirkwood||TARGET_orion +kmod-i2c-core
-endef
-
-define KernelPackage/i2c-mv64xxx/description
- Kernel module for I2C interface on the Kirkwood and Orion
- family processors.
-endef
-
-$(eval $(call KernelPackage,i2c-mv64xxx))
-
-
-I2C_AT91_MODULES:=\
-  CONFIG_I2C_AT91:drivers/i2c/busses/i2c-at91
-
-define KernelPackage/at91-i2c
-  $(call i2c_defaults,$(I2C_AT91_MODULES),55)
-  TITLE:=I2C (TWI) master driver for Atmel AT91
-  DEPENDS:=@TARGET_at91 +kmod-i2c-core
-endef
-
-define KernelPackage/at91-i2c/description
- Kernel module to use the I2C (TWI) master driver for Atmel AT91
-endef
-
-$(eval $(call KernelPackage,at91-i2c))
-
-I2C_OCTEON_MODULES:=\
-  CONFIG_I2C_OCTEON:drivers/i2c/busses/i2c-octeon
-
-define KernelPackage/octeon-i2c
-  $(call i2c_defaults,$(I2C_OCTEON_MODULES),59)
-  TITLE:=I2C master driver for Cavium Octeon
-  DEPENDS:=@TARGET_octeon +kmod-i2c-core
-endef
-
-define KernelPackage/octeon-i2c/description
-  Kernel module to use the I2C master driver on Cavium Octeon
-endef
-
-$(eval $(call KernelPackage,octeon-i2c))
-
-
 I2C_TINY_USB_MODULES:= \
   CONFIG_I2C_TINY_USB:drivers/i2c/busses/i2c-tiny-usb
 
diff --git a/target/linux/octeon/modules.mk b/target/linux/octeon/modules.mk
index a4552580b..999535c8a 100644
--- a/target/linux/octeon/modules.mk
+++ b/target/linux/octeon/modules.mk
@@ -37,3 +37,19 @@ define KernelPackage/usb-octeon/description
 endef
 
 $(eval $(call KernelPackage,usb-octeon))
+
+I2C_OCTEON_MODULES:=\
+  CONFIG_I2C_OCTEON:drivers/i2c/busses/i2c-octeon
+
+define KernelPackage/octeon-i2c
+  $(call i2c_defaults,$(I2C_OCTEON_MODULES),59)
+  TITLE:=I2C master driver for Cavium Octeon
+  DEPENDS:=@TARGET_octeon +kmod-i2c-core
+endef
+
+define KernelPackage/octeon-i2c/description
+  Kernel module to use the I2C master driver on Cavium Octeon
+endef
+
+$(eval $(call KernelPackage,octeon-i2c))
+