diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-10-26 15:14:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 17:02:13 -0400 |
commit | cd19cc4732395eb3dbaf49042233b5ac69b1fbd3 (patch) | |
tree | a904941e7033eac700530cdecdd759f933f6c9f0 /drivers/i2c | |
parent | 6344a8ece0bacccf61817450e8ccf78c973fc0c5 (diff) |
[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: 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>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-prosavage.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-prosavage.c b/drivers/i2c/busses/i2c-prosavage.c index 42f8b5ce3bf8..42cb1d8ca659 100644 --- a/drivers/i2c/busses/i2c-prosavage.c +++ b/drivers/i2c/busses/i2c-prosavage.c | |||
@@ -83,11 +83,6 @@ struct s_i2c_chip { | |||
83 | /* | 83 | /* |
84 | * i2c configuration | 84 | * i2c configuration |
85 | */ | 85 | */ |
86 | #ifndef I2C_HW_B_S3VIA | ||
87 | #define I2C_HW_B_S3VIA 0x18 /* S3VIA ProSavage adapter */ | ||
88 | #endif | ||
89 | |||
90 | /* delays */ | ||
91 | #define CYCLE_DELAY 10 | 86 | #define CYCLE_DELAY 10 |
92 | #define TIMEOUT (HZ / 2) | 87 | #define TIMEOUT (HZ / 2) |
93 | 88 | ||