Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd19cc47 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] i2c: ID redefinition cleanups 



Fix several redefinitions of i2c IDs. i2c IDs must not be defined
outside of i2c-id.h.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarHenk Vergonet <henk@god.dyndns.org>
Acked-by: default avatarMark McClelland <mark@alpha.dyndns.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6344a8ec

drivers/i2c/busses/i2c-prosavage.c

+0 −5
Original line number Diff line number Diff line
@@ -83,11 +83,6 @@ struct s_i2c_chip { 
/*

 * 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
Original line number Diff line number Diff line
@@ -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            */

/* --------------------------------- */