Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / drivers / misc / bmp085-i2c.c

diff --git a/drivers/misc/bmp085-i2c.c b/drivers/misc/bmp085-i2c.c
index 9943971c13e346a6d1d0f742df90c428024e1f71..a4f33c995ea17c6eabe257ae92c4fc950e49f0a5 100644 (file)
--- a/drivers/misc/bmp085-i2c.c
+++ b/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,