diff --git a/[refs] b/[refs] index 9e9ca5622d80..f8312fb23aae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 567fd1d4a66a2d6e5599be0ada582e0a3dbd23d4 +refs/heads/master: 4eb64ee135af6b477ff149a2072bcfa3118afb94 diff --git a/trunk/drivers/misc/bmp085-i2c.c b/trunk/drivers/misc/bmp085-i2c.c index 9943971c13e3..a4f33c995ea1 100644 --- a/trunk/drivers/misc/bmp085-i2c.c +++ b/trunk/drivers/misc/bmp085-i2c.c @@ -57,12 +57,6 @@ static int bmp085_i2c_remove(struct i2c_client *client) return bmp085_remove(&client->dev); } -static const struct of_device_id bmp085_of_match[] = { - { .compatible = "bosch,bmp085", }, - { }, -}; -MODULE_DEVICE_TABLE(of, bmp085_of_match); - static const struct i2c_device_id bmp085_id[] = { { BMP085_NAME, 0 }, { "bmp180", 0 }, @@ -74,7 +68,6 @@ static struct i2c_driver bmp085_i2c_driver = { .driver = { .owner = THIS_MODULE, .name = BMP085_NAME, - .of_match_table = bmp085_of_match }, .id_table = bmp085_id, .probe = bmp085_i2c_probe,