diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
commit | 846050dd49719b1f68248807bba5c27bfc86f81a (patch) | |
tree | 79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/s2io.c | |
parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) | |
download | linux-846050dd49719b1f68248807bba5c27bfc86f81a.tar.gz linux-846050dd49719b1f68248807bba5c27bfc86f81a.tar.bz2 linux-846050dd49719b1f68248807bba5c27bfc86f81a.zip |
Merge branch 'upstream-fixes' 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 @@ #include <asm/uaccess.h> #include <asm/io.h> #include <asm/div64.h> +#include <asm/irq.h> /* local include */ #include "s2io.h" |