From cac2a3c3c375c106322330b05fa4cbc2e8cceaf2 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 13 Jan 2010 23:34:18 +0000
Subject: [PATCH] --- yaml --- r: 185191 b: refs/heads/master c:
 e6c4ef984ebbd1a0458503417da91f3de47cbbe0 h: refs/heads/master i:   185189:
 a37d1a30d6ae3354228c7f8b7528f8a226c53b2a   185187:
 d7c49ebc0a6b74b286c455a36926dc98b90be0da   185183:
 ae274528b3e04a482a2b9a6d13ea85861f8ed536 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/char/cyclades.c          | 1 +
 trunk/drivers/char/ip2/ip2main.c       | 2 ++
 trunk/drivers/char/isicom.c            | 5 +++++
 trunk/drivers/char/moxa.c              | 3 +++
 trunk/drivers/serial/icom.c            | 4 +++-
 trunk/drivers/usb/serial/keyspan_pda.c | 7 +++++++
 7 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 67c25575e867..cf6bd76cb77b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02c95a62d8a0ad0ce71653b9f860b534f89ecc7b
+refs/heads/master: e6c4ef984ebbd1a0458503417da91f3de47cbbe0
diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
index e026f2447923..b861c08263a4 100644
--- a/trunk/drivers/char/cyclades.c
+++ b/trunk/drivers/char/cyclades.c
@@ -4195,3 +4195,4 @@ module_exit(cy_cleanup_module);
 MODULE_LICENSE("GPL");
 MODULE_VERSION(CY_VERSION);
 MODULE_ALIAS_CHARDEV_MAJOR(CYCLADES_MAJOR);
+MODULE_FIRMWARE("cyzfirm.bin");
diff --git a/trunk/drivers/char/ip2/ip2main.c b/trunk/drivers/char/ip2/ip2main.c
index c2c915a97667..911e1da6def2 100644
--- a/trunk/drivers/char/ip2/ip2main.c
+++ b/trunk/drivers/char/ip2/ip2main.c
@@ -3209,3 +3209,5 @@ static struct pci_device_id ip2main_pci_tbl[] __devinitdata = {
 };
 
 MODULE_DEVICE_TABLE(pci, ip2main_pci_tbl);
+
+MODULE_FIRMWARE("intelliport2.bin");
diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c
index 77d5a29ce80e..be2e8f9a27c3 100644
--- a/trunk/drivers/char/isicom.c
+++ b/trunk/drivers/char/isicom.c
@@ -1720,3 +1720,8 @@ module_exit(isicom_exit);
 MODULE_AUTHOR("MultiTech");
 MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("isi608.bin");
+MODULE_FIRMWARE("isi608em.bin");
+MODULE_FIRMWARE("isi616em.bin");
+MODULE_FIRMWARE("isi4608.bin");
+MODULE_FIRMWARE("isi4616.bin");
diff --git a/trunk/drivers/char/moxa.c b/trunk/drivers/char/moxa.c
index 49a1fc2ec6f2..166495d6a1d7 100644
--- a/trunk/drivers/char/moxa.c
+++ b/trunk/drivers/char/moxa.c
@@ -172,6 +172,9 @@ static unsigned int numports[MAX_BOARDS];
 MODULE_AUTHOR("William Chen");
 MODULE_DESCRIPTION("MOXA Intellio Family Multiport Board Device Driver");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("c218tunx.cod");
+MODULE_FIRMWARE("cp204unx.cod");
+MODULE_FIRMWARE("c320tunx.cod");
 
 module_param_array(type, uint, NULL, 0);
 MODULE_PARM_DESC(type, "card type: C218=2, C320=4");
diff --git a/trunk/drivers/serial/icom.c b/trunk/drivers/serial/icom.c
index 0028b6f89ce6..6e715b78d7a6 100644
--- a/trunk/drivers/serial/icom.c
+++ b/trunk/drivers/serial/icom.c
@@ -1654,4 +1654,6 @@ MODULE_DESCRIPTION("IBM iSeries Serial IOA driver");
 MODULE_SUPPORTED_DEVICE
     ("IBM iSeries 2745, 2771, 2772, 2742, 2793 and 2805 Communications adapters");
 MODULE_LICENSE("GPL");
-
+MODULE_FIRMWARE("icom_call_setup.bin");
+MODULE_FIRMWARE("icom_res_dce.bin");
+MODULE_FIRMWARE("icom_asc.bin");
diff --git a/trunk/drivers/usb/serial/keyspan_pda.c b/trunk/drivers/usb/serial/keyspan_pda.c
index 1296a097f5c3..84f08e968e0b 100644
--- a/trunk/drivers/usb/serial/keyspan_pda.c
+++ b/trunk/drivers/usb/serial/keyspan_pda.c
@@ -789,6 +789,13 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)
 	return 1;
 }
 
+#ifdef KEYSPAN
+MODULE_FIRMWARE("keyspan_pda/keyspan_pda.fw");
+#endif
+#ifdef XIRCOM
+MODULE_FIRMWARE("keyspan_pda/xircom_pgs.fw");
+#endif
+
 static int keyspan_pda_startup(struct usb_serial *serial)
 {