Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 27aadb615a2d767d629966e88dc7212ceb7c712e

Authored by Ken Kawasaki
Committed by David S. Miller
1 parent df213559f0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

fmvj18x_cs: add new id 

fmvj18x_cs:add new id
           Toshiba lan&modem multifuction card (model name:IPC5010A)

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 2 additions and 0 deletions Side-by-side Diff

drivers/net/pcmcia/fmvj18x_cs.c
Diff comments   View file @ 27aadb6
... ... @@ -691,6 +691,7 @@
691 691 PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a),
692 692 PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0e01),
693 693 PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0a05),
  694 + PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0b05),
694 695 PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x1101),
695 696 PCMCIA_DEVICE_NULL,
696 697 };
drivers/tty/serial/serial_cs.c
Diff comments   View file @ 27aadb6
... ... @@ -712,6 +712,7 @@
712 712 PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet+Modem II", 0x2e3ee845, 0xeca401bf),
713 713 PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0e01),
714 714 PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0a05),
  715 + PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0b05),
715 716 PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x1101),
716 717 PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070),
717 718 PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0101, 0x0562),