diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /arch/arm/mach-s3c2410/include/mach/irqs.h | |
| parent | 889c92d21db40be0b7d22a59395060237895bb85 (diff) | |
| parent | 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 (diff) | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/irqs.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h index 9565903d490b..49efce8cd4a7 100644 --- a/arch/arm/mach-s3c2410/include/mach/irqs.h +++ b/arch/arm/mach-s3c2410/include/mach/irqs.h | |||
| @@ -12,10 +12,6 @@ | |||
| 12 | #ifndef __ASM_ARCH_IRQS_H | 12 | #ifndef __ASM_ARCH_IRQS_H |
| 13 | #define __ASM_ARCH_IRQS_H __FILE__ | 13 | #define __ASM_ARCH_IRQS_H __FILE__ |
| 14 | 14 | ||
| 15 | #ifndef __ASM_ARM_IRQ_H | ||
| 16 | #error "Do not include this directly, instead #include <asm/irq.h>" | ||
| 17 | #endif | ||
| 18 | |||
| 19 | /* we keep the first set of CPU IRQs out of the range of | 15 | /* we keep the first set of CPU IRQs out of the range of |
| 20 | * the ISA space, so that the PC104 has them to itself | 16 | * the ISA space, so that the PC104 has them to itself |
| 21 | * and we don't end up having to do horrible things to the | 17 | * and we don't end up having to do horrible things to the |