diff --git a/package/kernel/linux/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk
index 14c5b6448e..2975db5dc2 100644
--- a/package/kernel/linux/modules/i2c.mk
+++ b/package/kernel/linux/modules/i2c.mk
@@ -104,43 +104,6 @@ endef
 
 $(eval $(call KernelPackage,i2c-gpio))
 
-I2C_TINY_USB_MODULES:= \
-  CONFIG_I2C_TINY_USB:drivers/i2c/busses/i2c-tiny-usb
-
-define KernelPackage/i2c-tiny-usb
-  $(call i2c_defaults,$(I2C_TINY_USB_MODULES),59)
-  TITLE:=I2C Tiny USB adaptor
-  DEPENDS:=@USB_SUPPORT kmod-i2c-core +kmod-usb-core
-endef
-
-define KernelPackage/i2c-tiny-usb/description
- Kernel module for the I2C Tiny USB adaptor developed
- by Till Harbaum (http://www.harbaum.org/till/i2c_tiny_usb)
-endef
-
-$(eval $(call KernelPackage,i2c-tiny-usb))
-
-
-I2C_PIIX4_MODULES:= \
-  CONFIG_I2C_PIIX4:drivers/i2c/busses/i2c-piix4
-
-define KernelPackage/i2c-piix4
-  $(call i2c_defaults,$(I2C_PIIX4_MODULES),59)
-  TITLE:=Intel PIIX4 and compatible I2C interfaces
-  DEPENDS:=@PCI_SUPPORT @TARGET_x86 kmod-i2c-core
-endef
-
-define KernelPackage/i2c-piix4/description
- Support for the Intel PIIX4 family of mainboard I2C interfaces,
- specifically Intel PIIX4, Intel 440MX, ATI IXP200, ATI IXP300,
- ATI IXP400, ATI SB600, ATI SB700/SP5100, ATI SB800, AMD Hudson-2,
- AMD ML, AMD CZ, Serverworks OSB4, Serverworks CSB5,
- Serverworks CSB6, Serverworks HT-1000, Serverworks HT-1100 and
- SMSC Victory66.
-endef
-
-$(eval $(call KernelPackage,i2c-piix4))
-
 
 I2C_I801_MODULES:= \
   CONFIG_I2C_I801:drivers/i2c/busses/i2c-i801
@@ -167,22 +130,6 @@ endef
 $(eval $(call KernelPackage,i2c-i801))
 
 
-I2C_SMBUS_MODULES:= \
-  CONFIG_I2C_SMBUS:drivers/i2c/i2c-smbus
-
-define KernelPackage/i2c-smbus
-  $(call i2c_defaults,$(I2C_SMBUS_MODULES),58)
-  TITLE:=SMBus-specific protocols helper
-  DEPENDS:=kmod-i2c-core
-endef
-
-define KernelPackage/i2c-smbus/description
- Support for the SMBus extensions to the I2C specification.
-endef
-
-$(eval $(call KernelPackage,i2c-smbus))
-
-
 I2C_MUX_MODULES:= \
   CONFIG_I2C_MUX:drivers/i2c/i2c-mux
 
@@ -213,6 +160,22 @@ endef
 
 $(eval $(call KernelPackage,i2c-mux-gpio))
 
+
+I2C_MUX_PCA9541_MODULES:= \
+  CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/i2c-mux-pca9541
+
+define KernelPackage/i2c-mux-pca9541
+  $(call i2c_defaults,$(I2C_MUX_PCA9541_MODULES),51)
+  TITLE:=Philips PCA9541 I2C mux/switches
+  DEPENDS:=kmod-i2c-mux
+endef
+
+define KernelPackage/i2c-mux-pca9541/description
+ Kernel modules for PCA9541 I2C bus mux/switching devices
+endef
+
+$(eval $(call KernelPackage,i2c-mux-pca9541))
+
 I2C_MUX_PCA954x_MODULES:= \
   CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/i2c-mux-pca954x
 
@@ -229,17 +192,58 @@ endef
 $(eval $(call KernelPackage,i2c-mux-pca954x))
 
 
-I2C_MUX_PCA9541_MODULES:= \
-  CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/i2c-mux-pca9541
+I2C_PIIX4_MODULES:= \
+  CONFIG_I2C_PIIX4:drivers/i2c/busses/i2c-piix4
 
-define KernelPackage/i2c-mux-pca9541
-  $(call i2c_defaults,$(I2C_MUX_PCA9541_MODULES),51)
-  TITLE:=Philips PCA9541 I2C mux/switches
-  DEPENDS:=kmod-i2c-mux
+define KernelPackage/i2c-piix4
+  $(call i2c_defaults,$(I2C_PIIX4_MODULES),59)
+  TITLE:=Intel PIIX4 and compatible I2C interfaces
+  DEPENDS:=@PCI_SUPPORT @TARGET_x86 kmod-i2c-core
 endef
 
-define KernelPackage/i2c-mux-pca9541/description
- Kernel modules for PCA9541 I2C bus mux/switching devices
+define KernelPackage/i2c-piix4/description
+ Support for the Intel PIIX4 family of mainboard I2C interfaces,
+ specifically Intel PIIX4, Intel 440MX, ATI IXP200, ATI IXP300,
+ ATI IXP400, ATI SB600, ATI SB700/SP5100, ATI SB800, AMD Hudson-2,
+ AMD ML, AMD CZ, Serverworks OSB4, Serverworks CSB5,
+ Serverworks CSB6, Serverworks HT-1000, Serverworks HT-1100 and
+ SMSC Victory66.
 endef
 
-$(eval $(call KernelPackage,i2c-mux-pca9541))
+$(eval $(call KernelPackage,i2c-piix4))
+
+
+I2C_SMBUS_MODULES:= \
+  CONFIG_I2C_SMBUS:drivers/i2c/i2c-smbus
+
+define KernelPackage/i2c-smbus
+  $(call i2c_defaults,$(I2C_SMBUS_MODULES),58)
+  TITLE:=SMBus-specific protocols helper
+  DEPENDS:=kmod-i2c-core
+endef
+
+define KernelPackage/i2c-smbus/description
+ Support for the SMBus extensions to the I2C specification.
+endef
+
+$(eval $(call KernelPackage,i2c-smbus))
+
+
+
+I2C_TINY_USB_MODULES:= \
+  CONFIG_I2C_TINY_USB:drivers/i2c/busses/i2c-tiny-usb
+
+define KernelPackage/i2c-tiny-usb
+  $(call i2c_defaults,$(I2C_TINY_USB_MODULES),59)
+  TITLE:=I2C Tiny USB adaptor
+  DEPENDS:=@USB_SUPPORT kmod-i2c-core +kmod-usb-core
+endef
+
+define KernelPackage/i2c-tiny-usb/description
+ Kernel module for the I2C Tiny USB adaptor developed
+ by Till Harbaum (http://www.harbaum.org/till/i2c_tiny_usb)
+endef
+
+$(eval $(call KernelPackage,i2c-tiny-usb))
+
+