diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:15:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:31 +0200 |
| commit | 38c3b2455edea648f38d3e11baf478488fd698ed (patch) | |
| tree | a66280a235dfd3fdb5c0411f4efc64b2b98aec0c /drivers/i2c | |
| parent | 5b7b7ee5d943c6b58d9b7f974167d0105ca1b787 (diff) | |
| parent | ca22ccd7cdbb6b2bd720dd7e14280ee1efa29074 (diff) | |
| download | barebox-38c3b2455edea648f38d3e11baf478488fd698ed.tar.gz barebox-38c3b2455edea648f38d3e11baf478488fd698ed.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
lib/Makefile
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index f7108c2605..adc952b043 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1132,7 +1132,7 @@ static struct platform_device_id omap_i2c_ids[] = { }, }; -static __maybe_unused struct of_device_id omap_spi_dt_ids[] = { +static __maybe_unused struct of_device_id omap_i2c_dt_ids[] = { { .compatible = "ti,omap3-i2c", .data = (unsigned long)&omap3_data, @@ -1148,7 +1148,7 @@ static struct driver_d omap_i2c_driver = { .probe = i2c_omap_probe, .name = DRIVER_NAME, .id_table = omap_i2c_ids, - .of_compatible = DRV_OF_COMPAT(omap_spi_dt_ids), + .of_compatible = DRV_OF_COMPAT(omap_i2c_dt_ids), }; device_platform_driver(omap_i2c_driver); |