diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /drivers/net/s2io.c | |
| parent | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 132ed32bce1a..e72e0e099060 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -71,6 +71,7 @@ | |||
| 71 | #include <asm/uaccess.h> | 71 | #include <asm/uaccess.h> |
| 72 | #include <asm/io.h> | 72 | #include <asm/io.h> |
| 73 | #include <asm/div64.h> | 73 | #include <asm/div64.h> |
| 74 | #include <asm/irq.h> | ||
| 74 | 75 | ||
| 75 | /* local include */ | 76 | /* local include */ |
| 76 | #include "s2io.h" | 77 | #include "s2io.h" |