diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
| commit | ab11d1ea281e85895369ef57c5259ad8a432fabb (patch) | |
| tree | 684147479c6a8bb2fbed21bdcf12de1dd519c730 /drivers/net/cs89x0.c | |
| parent | 952ecef7a0479049c8abb7c34a688ec2981ceadd (diff) | |
| parent | 664cceb0093b755739e56572b836a99104ee8a75 (diff) | |
Merge by hand from Linus' tree.
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 |