diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:41:57 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:41:57 -0700 |
| commit | c6df33694dbe813e34da1f893cbc08a5822a26d7 (patch) | |
| tree | c73e8332df16575a2a6dedbc0fc8a34b5ddc6587 /drivers/tty/serial/8250/8250_pnp.c | |
| parent | f0b7ed42af0d718fc11d45f6c05948e9a11e08be (diff) | |
| parent | 974070b95b0c8ff6ef0d62109c16aea160cf3c7c (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.11-androidlsk-v3.10-15.10-android
Diffstat (limited to 'drivers/tty/serial/8250/8250_pnp.c')
| -rw-r--r-- | drivers/tty/serial/8250/8250_pnp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c index 35d9ab95c5cb..91b14202b90b 100644 --- a/drivers/tty/serial/8250/8250_pnp.c +++ b/drivers/tty/serial/8250/8250_pnp.c @@ -365,6 +365,11 @@ static const struct pnp_device_id pnp_dev_table[] = { /* Winbond CIR port, should not be probed. We should keep track of it to prevent the legacy serial driver from probing it */ { "WEC1022", CIR_PORT }, + /* + * SMSC IrCC SIR/FIR port, should not be probed by serial driver + * as well so its own driver can bind to it. + */ + { "SMCF010", CIR_PORT }, { "", 0 } }; |