diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 07:47:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 07:47:13 -0700 |
| commit | 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (patch) | |
| tree | cc9cc1f5df8845471894010e625e130d111262a7 /include/asm-frv/irq.h | |
| parent | 6594d0b1cdfd9058f5b766e490ea1c94ae5e0ed4 (diff) | |
| parent | e69cc9278831139660cb99bde52908f145338d77 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv:
FRV: Move to arch/frv/include/asm/
FRV: Fix indentation errors to keep git-am happy when moving arch header files
Diffstat (limited to 'include/asm-frv/irq.h')
| -rw-r--r-- | include/asm-frv/irq.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/include/asm-frv/irq.h b/include/asm-frv/irq.h deleted file mode 100644 index 3a66ebd754b..00000000000 --- a/include/asm-frv/irq.h +++ /dev/null @@ -1,30 +0,0 @@ -/* irq.h: FRV IRQ definitions - * - * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. - * Written by David Howells (dhowells@redhat.com) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -#ifndef _ASM_IRQ_H_ -#define _ASM_IRQ_H_ - -#define NR_IRQS 48 -#define IRQ_BASE_CPU (0 * 16) -#define IRQ_BASE_FPGA (1 * 16) -#define IRQ_BASE_MB93493 (2 * 16) - -/* probe returns a 32-bit IRQ mask:-/ */ -#define MIN_PROBE_IRQ (NR_IRQS - 32) - -#ifndef __ASSEMBLY__ -static inline int irq_canonicalize(int irq) -{ - return irq; -} -#endif - -#endif /* _ASM_IRQ_H_ */ |