lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-3.1' into for-3.2

Browse Source
This commit is contained in:
Mark Brown
2011-08-11 12:30:26 +09:00
parent 4158a05741 feb00dceb5
commit 10645a7c68
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/codecs/wm8750.c
View File

@@ -781,6 +781,7 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi)
static const struct spi_device_id wm8750_spi_ids[] = { static const struct spi_device_id wm8750_spi_ids[] = {
{ "wm8750", 0 }, { "wm8750", 0 },
{ "wm8987", 0 }, { "wm8987", 0 },
{ 0, 0 },
}; };
MODULE_DEVICE_TABLE(spi, wm8750_spi_ids); MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);