diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 09:09:07 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 09:09:07 -0700 |
commit | 7da59d2fe30d8169c7c9e7b488beb1b9af932608 (patch) | |
tree | 02438ff9c258cf80d3a3955215fbcff7bd7e392e /drivers/misc/bmp085-i2c.c | |
parent | fea7a08acb13524b47711625eebea40a0ede69a0 (diff) | |
parent | 877cdf3949cc67d00677a1dfb913001f324ac40d (diff) |
Merge v3.6-rc3 into 'char-misc-next'
This resolves a conflict in:
drivers/misc/mei/interrupt.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/bmp085-i2c.c')
-rw-r--r-- | drivers/misc/bmp085-i2c.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/misc/bmp085-i2c.c b/drivers/misc/bmp085-i2c.c index 9943971c13e..a4f33c995ea 100644 --- 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, |