i2c: ID redefinition cleanups, 1 of 2
Subsystems (2)
PATCH 5/16 i2c: ID redefinition cleanups, 1 of 2
Content-Disposition: inline; filename=i2c-id-clean-redefinitions-1.patch
Fix several redefinitions of i2c IDs. i2c IDs must not be defined outside of i2c-id.h.
Signed-off-by Jean Delvare <[email protected]>
Signed-off-by Henk Vergonet <[email protected]>
Acked-by Mark McClelland <[email protected]>
--- drivers/i2c/busses/i2c-prosavage.c | 5 ----- include/media/ovcamchip.h | 14 -------------- 2 files changed, 19 deletions(-)
drivers/i2c/busses/i2c-prosavage.c +0 -5
@@ -83,11 +83,6 @@/* * i2c configuration */ -#ifndef I2C_HW_B_S3VIA -#define I2C_HW_B_S3VIA 0x18/* S3VIA ProSavage adapter */ -#endif - -/* delays */ #define CYCLE_DELAY 10#define TIMEOUT (HZ / 2)
include/media/ovcamchip.h +0 -14
@@ -17,20 +17,6 @@#include <linux/videodev.h> #include <linux/i2c.h> -/* Remove these once they are officially defined */ -#ifndef I2C_DRIVERID_OVCAMCHIP -#define I2C_DRIVERID_OVCAMCHIP 0xf00f -#endif -#ifndef I2C_HW_SMBUS_OV511 -#define I2C_HW_SMBUS_OV511 0xfe -#endif -#ifndef I2C_HW_SMBUS_OV518 -#define I2C_HW_SMBUS_OV518 0xff -#endif -#ifndef I2C_HW_SMBUS_OVFX2 -#define I2C_HW_SMBUS_OVFX2 0xfd -#endif -/* --------------------------------- */ /* ENUMERATIONS */ /* --------------------------------- */
Signature · 1 line
Jean Delvare