diff options
Diffstat (limited to 'drivers/nfc/pn533.c')
| -rw-r--r-- | drivers/nfc/pn533.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index cf1a87bb74f8..d46a700a9637 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c | |||
| @@ -55,26 +55,14 @@ | |||
| 55 | NFC_PROTO_NFC_DEP_MASK) | 55 | NFC_PROTO_NFC_DEP_MASK) |
| 56 | 56 | ||
| 57 | static const struct usb_device_id pn533_table[] = { | 57 | static const struct usb_device_id pn533_table[] = { |
| 58 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | 58 | { USB_DEVICE(PN533_VENDOR_ID, PN533_PRODUCT_ID), |
| 59 | .idVendor = PN533_VENDOR_ID, | 59 | .driver_info = PN533_DEVICE_STD }, |
| 60 | .idProduct = PN533_PRODUCT_ID, | 60 | { USB_DEVICE(SCM_VENDOR_ID, SCL3711_PRODUCT_ID), |
| 61 | .driver_info = PN533_DEVICE_STD, | 61 | .driver_info = PN533_DEVICE_STD }, |
| 62 | }, | 62 | { USB_DEVICE(SONY_VENDOR_ID, PASORI_PRODUCT_ID), |
| 63 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | 63 | .driver_info = PN533_DEVICE_PASORI }, |
| 64 | .idVendor = SCM_VENDOR_ID, | 64 | { USB_DEVICE(ACS_VENDOR_ID, ACR122U_PRODUCT_ID), |
| 65 | .idProduct = SCL3711_PRODUCT_ID, | 65 | .driver_info = PN533_DEVICE_ACR122U }, |
| 66 | .driver_info = PN533_DEVICE_STD, | ||
| 67 | }, | ||
| 68 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | ||
| 69 | .idVendor = SONY_VENDOR_ID, | ||
| 70 | .idProduct = PASORI_PRODUCT_ID, | ||
| 71 | .driver_info = PN533_DEVICE_PASORI, | ||
| 72 | }, | ||
| 73 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | ||
| 74 | .idVendor = ACS_VENDOR_ID, | ||
| 75 | .idProduct = ACR122U_PRODUCT_ID, | ||
| 76 | .driver_info = PN533_DEVICE_ACR122U, | ||
| 77 | }, | ||
| 78 | { } | 66 | { } |
| 79 | }; | 67 | }; |
| 80 | MODULE_DEVICE_TABLE(usb, pn533_table); | 68 | MODULE_DEVICE_TABLE(usb, pn533_table); |