diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 12:11:26 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 12:11:32 -0700 |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /arch/mips/sni/setup.c | |
| parent | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (diff) | |
| parent | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca (diff) | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/mips/sni/setup.c')
| -rw-r--r-- | arch/mips/sni/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index d16b462154c..413f17f8e89 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c @@ -10,6 +10,7 @@ */ #include <linux/eisa.h> #include <linux/init.h> +#include <linux/export.h> #include <linux/console.h> #include <linux/fb.h> #include <linux/screen_info.h> |