From: John Crispin <john@openwrt.org>
Date: Wed, 3 Apr 2013 10:00:32 +0000 (+0000)
Subject: make OF_I2C build as part of i2c-core
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c9254f5b5d1fb36ae754a54a0f212d75b457959a;p=openwrt%2Fstaging%2Fnbd.git

make OF_I2C build as part of i2c-core

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36179
---

diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index e01f93775d..101466f096 100644
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -22,6 +22,7 @@ endef
 
 I2C_CORE_MODULES:= \
   CONFIG_I2C:drivers/i2c/i2c-core \
+  CONFIG_OF_I2C:drivers/of/of_i2c \
   CONFIG_I2C_CHARDEV:drivers/i2c/i2c-dev
 
 define KernelPackage/i2c-core
@@ -100,23 +101,6 @@ 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||TARGET_mvebu \
-          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