diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 07:56:44 +0200 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 07:56:44 +0200 |
commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /arch/alpha/kernel/alpha_ksyms.c | |
parent | Input: make input_register_handler() return error codes (diff) | |
parent | x86: save/restore eflags in context switch (diff) | |
download | linux-0612ec48762bf8712db1925b2e67246d2237ebab.tar.xz linux-0612ec48762bf8712db1925b2e67246d2237ebab.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/alpha/kernel/alpha_ksyms.c')
-rw-r--r-- | arch/alpha/kernel/alpha_ksyms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c index 425643762bf5..f042cc42b00f 100644 --- a/arch/alpha/kernel/alpha_ksyms.c +++ b/arch/alpha/kernel/alpha_ksyms.c @@ -14,6 +14,7 @@ #include <linux/in.h> #include <linux/in6.h> #include <linux/pci.h> +#include <linux/screen_info.h> #include <linux/tty.h> #include <linux/mm.h> #include <linux/delay.h> |