diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-22 21:22:39 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-22 21:22:39 +0100 |
commit | 2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (patch) | |
tree | 08470935de327cb438cc9ec738b0e025c3c0b556 /drivers/tty/serial | |
parent | 2efa1d59fe5af81456393472121623c9502548ce (diff) | |
parent | 947d299686aa9cc8aecf749d54e8475c6e498956 (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r-- | drivers/tty/serial/max310x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 2bc28a59d38..1ab1d2c66de 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -1239,6 +1239,7 @@ static int __devexit max310x_remove(struct spi_device *spi) static const struct spi_device_id max310x_id_table[] = { { "max3107", MAX310X_TYPE_MAX3107 }, { "max3108", MAX310X_TYPE_MAX3108 }, + { } }; MODULE_DEVICE_TABLE(spi, max310x_id_table); |