Commit 29571ad6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents c38071c0 511d8cf0

sound/soc/codecs/wm8750.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -782,7 +782,7 @@ static const struct spi_device_id wm8750_spi_ids[] = { 
	{ "wm8750", 0 },

	{ "wm8750", 0 },

	{ "wm8987", 0 },

	{ "wm8987", 0 },

};

};

MODULE_DEVICE_TABLE(spi, wm8750_spi_id);

MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);





static struct spi_driver wm8750_spi_driver = {

static struct spi_driver wm8750_spi_driver = {

	.driver = {

	.driver = {