diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/net/r6040.c | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 5e8540b6ffa1..6f97b47d74a6 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -160,6 +160,7 @@ MODULE_AUTHOR("Sten Wang <sten.wang@rdc.com.tw>," | |||
| 160 | "Florian Fainelli <florian@openwrt.org>"); | 160 | "Florian Fainelli <florian@openwrt.org>"); |
| 161 | MODULE_LICENSE("GPL"); | 161 | MODULE_LICENSE("GPL"); |
| 162 | MODULE_DESCRIPTION("RDC R6040 NAPI PCI FastEthernet driver"); | 162 | MODULE_DESCRIPTION("RDC R6040 NAPI PCI FastEthernet driver"); |
| 163 | MODULE_VERSION(DRV_VERSION " " DRV_RELDATE); | ||
| 163 | 164 | ||
| 164 | /* RX and TX interrupts that we handle */ | 165 | /* RX and TX interrupts that we handle */ |
| 165 | #define RX_INTS (RX_FIFO_FULL | RX_NO_DESC | RX_FINISH) | 166 | #define RX_INTS (RX_FIFO_FULL | RX_NO_DESC | RX_FINISH) |