diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 03:21:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 03:21:36 +0100 |
| commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
| tree | eb5f2541e70d27144720e1735b463471025908f0 /drivers/tty/serial/max310x.c | |
| parent | misc: apds9802als: Fix the logic checking timeout in als_wait_for_data_ready() (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | linux-98c4514ff6e3072288770db66f91bdb15af8b433.tar.xz linux-98c4514ff6e3072288770db66f91bdb15af8b433.zip | |
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'drivers/tty/serial/max310x.c')
| -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 2bc28a59d385..1ab1d2c66de4 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); |