2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00

Merge branch 'for-3.1' into for-3.2

This commit is contained in:
Mark Brown 2011-08-11 12:30:26 +09:00
commit 10645a7c68

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[] = {
{ "wm8750", 0 },
{ "wm8987", 0 },
{ 0, 0 },
};
MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);