diff options
author | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-03-20 18:30:36 +0100 |
---|---|---|
committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-03-20 18:30:36 +0100 |
commit | 0f76ee451484d02c7405d92e7bceb39b415abb01 (patch) | |
tree | 9722f84281f786ba48971dde057f5171a49969e4 /include/linux/kexec.h | |
parent | 01d206a7c1167639f6ca6dac22140fbdca017558 (diff) | |
parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
download | op-kernel-dev-0f76ee451484d02c7405d92e7bceb39b415abb01.zip op-kernel-dev-0f76ee451484d02c7405d92e7bceb39b415abb01.tar.gz |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/kexec.h')
-rw-r--r-- | include/linux/kexec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index a311f58..cfb3410 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -6,6 +6,7 @@ #include <linux/list.h> #include <linux/linkage.h> #include <linux/compat.h> +#include <linux/ioport.h> #include <asm/kexec.h> /* Verify architecture specific macros are defined */ |