diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:36:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:36:08 -0400 |
| commit | 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb (patch) | |
| tree | addbc37a278a126a19e03edd8270e577c75a8829 /drivers/net/dl2k.c | |
| parent | 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 (diff) | |
| parent | e2a7f77a7b4ab298a38c8d1f624628456069bdb0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'drivers/net/dl2k.c')
| -rw-r--r-- | drivers/net/dl2k.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index 1ddefd281213..038447fb5c5e 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #define DRV_VERSION "v1.17b" | 53 | #define DRV_VERSION "v1.17b" |
| 54 | #define DRV_RELDATE "2006/03/10" | 54 | #define DRV_RELDATE "2006/03/10" |
| 55 | #include "dl2k.h" | 55 | #include "dl2k.h" |
| 56 | #include <linux/dma-mapping.h> | ||
| 56 | 57 | ||
| 57 | static char version[] __devinitdata = | 58 | static char version[] __devinitdata = |
| 58 | KERN_INFO DRV_NAME " " DRV_VERSION " " DRV_RELDATE "\n"; | 59 | KERN_INFO DRV_NAME " " DRV_VERSION " " DRV_RELDATE "\n"; |