diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/i2c/busses/i2c-i801.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/i2c/busses/i2c-i801.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index ed2e0c5ea37..72c0415f6f9 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
| @@ -96,7 +96,7 @@ | |||
| 96 | #define SMBHSTCFG_SMB_SMI_EN 2 | 96 | #define SMBHSTCFG_SMB_SMI_EN 2 |
| 97 | #define SMBHSTCFG_I2C_EN 4 | 97 | #define SMBHSTCFG_I2C_EN 4 |
| 98 | 98 | ||
| 99 | /* Auxillary control register bits, ICH4+ only */ | 99 | /* Auxiliary control register bits, ICH4+ only */ |
| 100 | #define SMBAUXCTL_CRC 1 | 100 | #define SMBAUXCTL_CRC 1 |
| 101 | #define SMBAUXCTL_E32B 2 | 101 | #define SMBAUXCTL_E32B 2 |
| 102 | 102 | ||