diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
| commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
| tree | 6de4096f1887e2c00966177354b1c378e59bd632 /arch/sh | |
| parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
| parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) | |
| download | talos-obmc-linux-2dc94310bd94d0906febea7d0f7c188da620c952.tar.gz talos-obmc-linux-2dc94310bd94d0906febea7d0f7c188da620c952.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index 22dc9c21201d..f2031314cb2b 100644 --- a/arch/sh/kernel/process.c +++ b/arch/sh/kernel/process.c @@ -26,6 +26,7 @@ #include <asm/uaccess.h> #include <asm/mmu_context.h> #include <asm/elf.h> +#include <asm/ubc.h> static int hlt_counter=0; |
