AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] i2c: ID redefinition cleanups

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

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Henk Vergonet <henk@god.dyndns.org>
Acked-by: Mark McClelland <mark@alpha.dyndns.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jean Delvare 2005-10-26 21:14:16 +02:00 committed by Greg Kroah-Hartman
parent 6344a8ece0
commit cd19cc4732
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/i2c/busses/i2c-prosavage.c
View File

@ -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)

14
include/media/ovcamchip.h
View File

@ -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 */
/* --------------------------------- */