diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/spider_net.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 90e663f4515c..782910cf220f 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -57,6 +57,7 @@ MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and Jens Osterkamp " \ | |||
| 57 | MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver"); | 57 | MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver"); |
| 58 | MODULE_LICENSE("GPL"); | 58 | MODULE_LICENSE("GPL"); |
| 59 | MODULE_VERSION(VERSION); | 59 | MODULE_VERSION(VERSION); |
| 60 | MODULE_FIRMWARE(SPIDER_NET_FIRMWARE_NAME); | ||
| 60 | 61 | ||
| 61 | static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT; | 62 | static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT; |
| 62 | static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT; | 63 | static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT; |