diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 12:57:19 +0300 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 12:57:19 +0300 |
commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
tree | b37281abef014cd60803b81c100388d7a475d49e /include/asm-sh/cpu-sh2/mmu_context.h | |
parent | ed25ffa16434724f5ed825aa48734c7f3aefa203 (diff) | |
parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
download | linux-8d1413b28033c49c7f1a4d320e815d7a5531acee.tar.xz |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'include/asm-sh/cpu-sh2/mmu_context.h')
-rw-r--r-- | include/asm-sh/cpu-sh2/mmu_context.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/asm-sh/cpu-sh2/mmu_context.h b/include/asm-sh/cpu-sh2/mmu_context.h new file mode 100644 index 000000000000..beeb299e01ec --- /dev/null +++ b/include/asm-sh/cpu-sh2/mmu_context.h @@ -0,0 +1,16 @@ +/* + * include/asm-sh/cpu-sh2/mmu_context.h + * + * Copyright (C) 2003 Paul Mundt + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef __ASM_CPU_SH2_MMU_CONTEXT_H +#define __ASM_CPU_SH2_MMU_CONTEXT_H + +/* No MMU */ + +#endif /* __ASM_CPU_SH2_MMU_CONTEXT_H */ + |