Merge tag 'module-final-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / include / linux / i2c-omap.h

diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h
index 92a0dc7..babe0cf 100644 (file)
--- a/include/linux/i2c-omap.h
+++ b/include/linux/i2c-omap.h
@@ -20,8 +20,6 @@
 #define OMAP_I2C_FLAG_NO_FIFO                  BIT(0)
 #define OMAP_I2C_FLAG_SIMPLE_CLOCK             BIT(1)
 #define OMAP_I2C_FLAG_16BIT_DATA_REG           BIT(2)
-#define OMAP_I2C_FLAG_RESET_REGS_POSTIDLE      BIT(3)
-#define OMAP_I2C_FLAG_APPLY_ERRATA_I207        BIT(4)
 #define OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK        BIT(5)
 #define OMAP_I2C_FLAG_FORCE_19200_INT_CLK      BIT(6)
 /* how the CPU address bus must be translated for I2C unit access */