diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /target/linux/patches/3.4.65/gemalto.patch | |
parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) |
resolve conflicts
Diffstat (limited to 'target/linux/patches/3.4.65/gemalto.patch')
-rw-r--r-- | target/linux/patches/3.4.65/gemalto.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/patches/3.4.65/gemalto.patch b/target/linux/patches/3.4.65/gemalto.patch new file mode 100644 index 000000000..65f7af1d7 --- /dev/null +++ b/target/linux/patches/3.4.65/gemalto.patch @@ -0,0 +1,11 @@ +diff -Nur linux-2.6.36.orig/drivers/tty/serial/8250/serial_cs.c linux-2.6.36/drivers/serial/8250/serial_cs.c +--- linux-2.6.36.orig/drivers/tty/serial/8250/serial_cs.c 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/drivers/tty/serial/8250/serial_cs.c 2010-12-13 23:03:40.000000000 +0100 +@@ -794,6 +794,7 @@ + PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025), + PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045), + PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052), ++ PCMCIA_DEVICE_MANF_CARD(0x0157, 0x0100), /* Gemalto SCR */ + PCMCIA_DEVICE_MANF_CARD(0x016c, 0x0006), /* Psion 56K+Fax */ + PCMCIA_DEVICE_MANF_CARD(0x0200, 0x0001), /* MultiMobile */ + PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae), |