diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 12:52:16 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 12:52:16 +0200 |
commit | 8a90bb5116889e98008fbc8178fc2a77bb51df4a (patch) | |
tree | 210b6755c9ae2d0d66a79f8696469ab50b7621ad /drivers/i2c/busses/i2c-designware-platdrv.c | |
parent | d47333ddb234dbc661ab2a4fe019758bd33ba33b (diff) | |
parent | 1ab9ecc24819a8cf8ee982aaf6fb83298f094b0d (diff) | |
download | op-kernel-dev-8a90bb5116889e98008fbc8178fc2a77bb51df4a.zip op-kernel-dev-8a90bb5116889e98008fbc8178fc2a77bb51df4a.tar.gz |
Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.10
A series of driver specific updates, none particularly critical, plus
one fix to the compressed API code to handle capture streams properly
which is very safe for mainline as there's no current users.
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-platdrv.c')
-rw-r--r-- | drivers/i2c/busses/i2c-designware-platdrv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 8ec9133..35b70a1 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -69,6 +69,7 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) static const struct acpi_device_id dw_i2c_acpi_match[] = { { "INT33C2", 0 }, { "INT33C3", 0 }, + { "80860F41", 0 }, { } }; MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match); |