Merge commit 'v2.6.29' into core/header-fixes

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-elektor.c

diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 0ed3ccb81b63f74f04a24589a5c3c26ad5fa1ed8..448b4bf35eb7f3cf9788c1638f5ecc0b11676d7f 100644 (file)
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -202,7 +202,6 @@ static struct i2c_algo_pcf_data pcf_isa_data = {
 static struct i2c_adapter pcf_isa_ops = {
        .owner          = THIS_MODULE,
        .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
-       .id             = I2C_HW_P_ELEK,
        .algo_data      = &pcf_isa_data,
        .name           = "i2c-elektor",
 };