aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/prism54/islpci_dev.c
diff options
context:
space:
mode:
authorAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
committerAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
commitada47b5fe13d89735805b566185f4885f5a3f750 (patch)
tree644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wireless/prism54/islpci_dev.c
parent43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff)
parent3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff)
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/prism54/islpci_dev.c')
-rw-r--r--drivers/net/wireless/prism54/islpci_dev.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 2505be56ae39..689d59a13d5b 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -19,6 +19,7 @@
19 */ 19 */
20 20
21#include <linux/module.h> 21#include <linux/module.h>
22#include <linux/slab.h>
22 23
23#include <linux/netdevice.h> 24#include <linux/netdevice.h>
24#include <linux/ethtool.h> 25#include <linux/ethtool.h>
@@ -41,6 +42,9 @@
41#define ISL3877_IMAGE_FILE "isl3877" 42#define ISL3877_IMAGE_FILE "isl3877"
42#define ISL3886_IMAGE_FILE "isl3886" 43#define ISL3886_IMAGE_FILE "isl3886"
43#define ISL3890_IMAGE_FILE "isl3890" 44#define ISL3890_IMAGE_FILE "isl3890"
45MODULE_FIRMWARE(ISL3877_IMAGE_FILE);
46MODULE_FIRMWARE(ISL3886_IMAGE_FILE);
47MODULE_FIRMWARE(ISL3890_IMAGE_FILE);
44 48
45static int prism54_bring_down(islpci_private *); 49static int prism54_bring_down(islpci_private *);
46static int islpci_alloc_memory(islpci_private *); 50static int islpci_alloc_memory(islpci_private *);