diff options
author | James Bottomley <JBottomley@Parallels.com> | 2013-06-27 08:08:22 +0200 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-06-27 08:08:22 +0200 |
commit | a9e94ec3504ead4b87a929bc57f5aa99a6590437 (patch) | |
tree | b6e7aaec0e844dc066e93296a85e5769542ef525 /arch/mips/wrppmc/reset.c | |
parent | Merge tag 'fcoe' into fixes (diff) | |
parent | fcoe: Use correct API to set vlan tag for FCoE Ethertype skbs (diff) | |
download | linux-a9e94ec3504ead4b87a929bc57f5aa99a6590437.tar.xz linux-a9e94ec3504ead4b87a929bc57f5aa99a6590437.zip |
Merge tag 'fcoe1' into fixes
This patch fixes a critical bug that was introduced in 3.9
related to VLAN tagging FCoE frames.
Diffstat (limited to 'arch/mips/wrppmc/reset.c')
-rw-r--r-- | arch/mips/wrppmc/reset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/wrppmc/reset.c b/arch/mips/wrppmc/reset.c index cc5474b24f06..80beb188ed47 100644 --- a/arch/mips/wrppmc/reset.c +++ b/arch/mips/wrppmc/reset.c @@ -9,6 +9,7 @@ #include <linux/kernel.h> #include <asm/cacheflush.h> +#include <asm/idle.h> #include <asm/mipsregs.h> #include <asm/processor.h> |