diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/net/cs89x0.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/net/cs89x0.c')
| -rw-r--r-- | drivers/net/cs89x0.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index cdc07ccd7332..a6078ad9b654 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -140,6 +140,7 @@ | |||
| 140 | 140 | ||
| 141 | #include <asm/system.h> | 141 | #include <asm/system.h> |
| 142 | #include <asm/io.h> | 142 | #include <asm/io.h> |
| 143 | #include <asm/irq.h> | ||
| 143 | #if ALLOW_DMA | 144 | #if ALLOW_DMA |
| 144 | #include <asm/dma.h> | 145 | #include <asm/dma.h> |
| 145 | #endif | 146 | #endif |