diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-14 21:36:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-14 21:36:21 -0400 |
| commit | aba297927d1d558c7a94548135133bdf9172708a (patch) | |
| tree | d107c53de78175124ba5c3ade07fc295c48f9331 /drivers/net | |
| parent | 08f3dfe8c4b91189890019d307aad236c3633515 (diff) | |
| parent | 462b529f91b618f4bd144bbc6184f616dfb58a1e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (30 commits)
[PARISC] remove global_ack_eiem
[PARISC] Fix kernel panic in check_ivt
[PARISC] Fix bug when syscall nr is __NR_Linux_syscalls
[PARISC] be more defensive in process.c::get_wchan
[PARISC] fix "reduce size of task_struct on 64-bit machines" fallout
[PARISC] fix null ptr deref in unwind.c
[PARISC] fix trivial spelling nit in asm/linkage.h
[PARISC] remove remnants of parisc-specific softirq code
[PARISC] fix section mismatch in smp.c
[PARISC] fix "ENTRY" macro redefinition
[PARISC] Wire up utimensat/signalfd/timerfd/eventfd syscalls
[PARISC] fix section mismatch in superio serial drivers
[PARISC] fix section mismatch in parisc eisa driver
[PARISC] fix section mismatches in arch/parisc/kernel
[PARISC] fix section mismatch in ccio-dma
[PARISC] fix section mismatch in parisc STI video drivers
[PARISC] fix section mismatch in parport_gsc
[PARISC] fix lasi_82596 build
[PARISC] Build fixes for power.c
[PARISC] kobject is embedded in subsys, not kset
...
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/lasi_82596.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index 6b49fc4bd1a1..741780e14b2c 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
| @@ -83,6 +83,7 @@ | |||
| 83 | #include <linux/init.h> | 83 | #include <linux/init.h> |
| 84 | #include <linux/types.h> | 84 | #include <linux/types.h> |
| 85 | #include <linux/bitops.h> | 85 | #include <linux/bitops.h> |
| 86 | #include <linux/dma-mapping.h> | ||
| 86 | 87 | ||
| 87 | #include <asm/io.h> | 88 | #include <asm/io.h> |
| 88 | #include <asm/pgtable.h> | 89 | #include <asm/pgtable.h> |