diff options
author | Ingo Molnar | 2008-08-14 12:19:59 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-08-14 12:19:59 +0200 |
commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /include/asm-sh/lboxre2.h | |
parent | X86_SMP: tlb_XX.c declare smp_invalidate_interrupt before they get used (diff) | |
parent | Linux 2.6.27-rc3 (diff) | |
download | kernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.tar.gz kernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.tar.xz kernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.zip |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sh/lboxre2.h')
-rw-r--r-- | include/asm-sh/lboxre2.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/asm-sh/lboxre2.h b/include/asm-sh/lboxre2.h deleted file mode 100644 index e6d160504923..000000000000 --- a/include/asm-sh/lboxre2.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __ASM_SH_LBOXRE2_H -#define __ASM_SH_LBOXRE2_H - -/* - * Copyright (C) 2007 Nobuhiro Iwamatsu - * - * NTT COMWARE L-BOX RE2 support - * - * 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. - * - */ - -#define IRQ_CF1 9 /* CF1 */ -#define IRQ_CF0 10 /* CF0 */ -#define IRQ_INTD 11 /* INTD */ -#define IRQ_ETH1 12 /* Ether1 */ -#define IRQ_ETH0 13 /* Ether0 */ -#define IRQ_INTA 14 /* INTA */ - -void init_lboxre2_IRQ(void); - -#define __IO_PREFIX lboxre2 -#include <asm/io_generic.h> - -#endif /* __ASM_SH_LBOXRE2_H */ |