diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2010-01-13 18:34:18 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:43:15 -0500 |
| commit | e6c4ef984ebbd1a0458503417da91f3de47cbbe0 (patch) | |
| tree | c8bcb9c2f802b22a7c184c5fcc26db0773b078ba | |
| parent | 02c95a62d8a0ad0ce71653b9f860b534f89ecc7b (diff) | |
tty: declare MODULE_FIRMWARE in various drivers
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/char/cyclades.c | 1 | ||||
| -rw-r--r-- | drivers/char/ip2/ip2main.c | 2 | ||||
| -rw-r--r-- | drivers/char/isicom.c | 5 | ||||
| -rw-r--r-- | drivers/char/moxa.c | 3 | ||||
| -rw-r--r-- | drivers/serial/icom.c | 4 | ||||
| -rw-r--r-- | drivers/usb/serial/keyspan_pda.c | 7 |
6 files changed, 21 insertions, 1 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index e026f2447923..b861c08263a4 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
| @@ -4195,3 +4195,4 @@ module_exit(cy_cleanup_module); | |||
| 4195 | MODULE_LICENSE("GPL"); | 4195 | MODULE_LICENSE("GPL"); |
| 4196 | MODULE_VERSION(CY_VERSION); | 4196 | MODULE_VERSION(CY_VERSION); |
| 4197 | MODULE_ALIAS_CHARDEV_MAJOR(CYCLADES_MAJOR); | 4197 | MODULE_ALIAS_CHARDEV_MAJOR(CYCLADES_MAJOR); |
| 4198 | MODULE_FIRMWARE("cyzfirm.bin"); | ||
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index c2c915a97667..911e1da6def2 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
| @@ -3209,3 +3209,5 @@ static struct pci_device_id ip2main_pci_tbl[] __devinitdata = { | |||
| 3209 | }; | 3209 | }; |
| 3210 | 3210 | ||
| 3211 | MODULE_DEVICE_TABLE(pci, ip2main_pci_tbl); | 3211 | MODULE_DEVICE_TABLE(pci, ip2main_pci_tbl); |
| 3212 | |||
| 3213 | MODULE_FIRMWARE("intelliport2.bin"); | ||
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 77d5a29ce80e..be2e8f9a27c3 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
| @@ -1720,3 +1720,8 @@ module_exit(isicom_exit); | |||
| 1720 | MODULE_AUTHOR("MultiTech"); | 1720 | MODULE_AUTHOR("MultiTech"); |
| 1721 | MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech"); | 1721 | MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech"); |
| 1722 | MODULE_LICENSE("GPL"); | 1722 | MODULE_LICENSE("GPL"); |
| 1723 | MODULE_FIRMWARE("isi608.bin"); | ||
| 1724 | MODULE_FIRMWARE("isi608em.bin"); | ||
| 1725 | MODULE_FIRMWARE("isi616em.bin"); | ||
| 1726 | MODULE_FIRMWARE("isi4608.bin"); | ||
| 1727 | MODULE_FIRMWARE("isi4616.bin"); | ||
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 49a1fc2ec6f2..166495d6a1d7 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c | |||
| @@ -172,6 +172,9 @@ static unsigned int numports[MAX_BOARDS]; | |||
| 172 | MODULE_AUTHOR("William Chen"); | 172 | MODULE_AUTHOR("William Chen"); |
| 173 | MODULE_DESCRIPTION("MOXA Intellio Family Multiport Board Device Driver"); | 173 | MODULE_DESCRIPTION("MOXA Intellio Family Multiport Board Device Driver"); |
| 174 | MODULE_LICENSE("GPL"); | 174 | MODULE_LICENSE("GPL"); |
| 175 | MODULE_FIRMWARE("c218tunx.cod"); | ||
| 176 | MODULE_FIRMWARE("cp204unx.cod"); | ||
| 177 | MODULE_FIRMWARE("c320tunx.cod"); | ||
| 175 | 178 | ||
| 176 | module_param_array(type, uint, NULL, 0); | 179 | module_param_array(type, uint, NULL, 0); |
| 177 | MODULE_PARM_DESC(type, "card type: C218=2, C320=4"); | 180 | MODULE_PARM_DESC(type, "card type: C218=2, C320=4"); |
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 0028b6f89ce6..6e715b78d7a6 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
| @@ -1654,4 +1654,6 @@ MODULE_DESCRIPTION("IBM iSeries Serial IOA driver"); | |||
| 1654 | MODULE_SUPPORTED_DEVICE | 1654 | MODULE_SUPPORTED_DEVICE |
| 1655 | ("IBM iSeries 2745, 2771, 2772, 2742, 2793 and 2805 Communications adapters"); | 1655 | ("IBM iSeries 2745, 2771, 2772, 2742, 2793 and 2805 Communications adapters"); |
| 1656 | MODULE_LICENSE("GPL"); | 1656 | MODULE_LICENSE("GPL"); |
| 1657 | 1657 | MODULE_FIRMWARE("icom_call_setup.bin"); | |
| 1658 | MODULE_FIRMWARE("icom_res_dce.bin"); | ||
| 1659 | MODULE_FIRMWARE("icom_asc.bin"); | ||
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 1296a097f5c3..84f08e968e0b 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
| @@ -789,6 +789,13 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial) | |||
| 789 | return 1; | 789 | return 1; |
| 790 | } | 790 | } |
| 791 | 791 | ||
| 792 | #ifdef KEYSPAN | ||
| 793 | MODULE_FIRMWARE("keyspan_pda/keyspan_pda.fw"); | ||
| 794 | #endif | ||
| 795 | #ifdef XIRCOM | ||
| 796 | MODULE_FIRMWARE("keyspan_pda/xircom_pgs.fw"); | ||
| 797 | #endif | ||
| 798 | |||
| 792 | static int keyspan_pda_startup(struct usb_serial *serial) | 799 | static int keyspan_pda_startup(struct usb_serial *serial) |
| 793 | { | 800 | { |
| 794 | 801 | ||
