summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2017-08-13 16:21:17 +0200
committerWolfram Sang <wsa@the-dreams.de>2017-08-27 15:37:18 +0200
commita1cc5a57e49e871ce5e610597af1bd6bea06cb5c (patch)
treec7889730521d10b438775b7665f7e51ce9f7c143 /drivers/i2c
parenti2c: davinci: Preserve return value of devm_clk_get (diff)
downloadlinux-a1cc5a57e49e871ce5e610597af1bd6bea06cb5c.tar.xz
linux-a1cc5a57e49e871ce5e610597af1bd6bea06cb5c.zip
blackfin: merge the two TWI header files
There seems to be no need for separate ones since all users include both files anyhow. Merge them because include/linux/i2c is to be deprecated. Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-bfin-twi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 9fe942b8c610..ff3343186a82 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -21,7 +21,6 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
-#include <linux/i2c/bfin_twi.h>
#include <asm/irq.h>
#include <asm/portmux.h>