diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-10-09 08:59:14 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-10-09 08:59:22 +0200 |
| commit | a0efa2f362a69e47b9d8b48f770ef3a0249a7911 (patch) | |
| tree | 384d2c79a9b613213ef7591583d820d18c7be9c3 /drivers/media/tuners/tda18212.c | |
| parent | Revert "wifi: cfg80211: unexport wireless_nlevent_flush()" (diff) | |
| parent | net: phy: microchip_t1: SQI support for LAN887x (diff) | |
| download | linux-a0efa2f362a69e47b9d8b48f770ef3a0249a7911.tar.xz linux-a0efa2f362a69e47b9d8b48f770ef3a0249a7911.zip | |
Merge net-next/main to resolve conflicts
The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/media/tuners/tda18212.c')
| -rw-r--r-- | drivers/media/tuners/tda18212.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/tuners/tda18212.c b/drivers/media/tuners/tda18212.c index 8d742bd61df0..39f2dc9c2845 100644 --- a/drivers/media/tuners/tda18212.c +++ b/drivers/media/tuners/tda18212.c @@ -254,7 +254,7 @@ static void tda18212_remove(struct i2c_client *client) } static const struct i2c_device_id tda18212_id[] = { - {"tda18212", 0}, + { "tda18212" }, {} }; MODULE_DEVICE_TABLE(i2c, tda18212_id); |