diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:05:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:05:50 +0100 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /drivers/net/tehuti.h | |
| parent | dma-debug: make memory range checks more consistent (diff) | |
| parent | Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm... (diff) | |
| download | linux-b0d44c0dbbd52effb731b1c0af9afd56215c48de.tar.xz linux-b0d44c0dbbd52effb731b1c0af9afd56215c48de.zip | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'drivers/net/tehuti.h')
| -rw-r--r-- | drivers/net/tehuti.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h index efaf84d9757d..dec67e0a9ca2 100644 --- a/drivers/net/tehuti.h +++ b/drivers/net/tehuti.h @@ -29,6 +29,7 @@ #include <linux/if_vlan.h> #include <linux/interrupt.h> #include <linux/vmalloc.h> +#include <linux/firmware.h> #include <asm/byteorder.h> /* Compile Time Switches */ |