Commit 10645a7c authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents 4158a057 feb00dce

sound/soc/codecs/wm8750.c

+1 −0
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) 
static const struct spi_device_id wm8750_spi_ids[] = {

	{ "wm8750", 0 },

	{ "wm8987", 0 },

	{ 0, 0 },

};

MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);