aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorJan Glauber <jglauber@cavium.com>2016-08-24 23:25:42 +0200
committerWolfram Sang <wsa@the-dreams.de>2016-08-26 00:41:52 +0200
commit68af512a74481d579443f3c81e7a017d06f677c2 (patch)
tree704763a706bb6fac7fa456fc771ab94cc28afb94 /drivers/i2c
parenti2c: add i2c_trylock_bus wrapper, use it (diff)
downloadlinux-dev-68af512a74481d579443f3c81e7a017d06f677c2.tar.xz
linux-dev-68af512a74481d579443f3c81e7a017d06f677c2.zip
i2c: octeon: Rename driver to prepare for split
This is an intermediate commit in preparation of the driver split. The module rename in this commit will be reverted in the next patch, this is just done to make the series bisectible. Signed-off-by: Jan Glauber <jglauber@cavium.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/Makefile2
-rw-r--r--drivers/i2c/busses/i2c-octeon-platdrv.c (renamed from drivers/i2c/busses/i2c-octeon.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 37f2819b4560..f2c9c6f9b89d 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -91,7 +91,7 @@ obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o
obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o
obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o
obj-$(CONFIG_I2C_WMT) += i2c-wmt.o
-obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o
+obj-$(CONFIG_I2C_OCTEON) += i2c-octeon-platdrv.o
obj-$(CONFIG_I2C_XILINX) += i2c-xiic.o
obj-$(CONFIG_I2C_XLR) += i2c-xlr.o
obj-$(CONFIG_I2C_XLP9XX) += i2c-xlp9xx.o
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon-platdrv.c
index b75d2da79b27..b75d2da79b27 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon-platdrv.c