From 413cb3d998462683d40ae99a2d30f97f09588545 Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Wed, 19 Nov 2008 17:11:03 +0000 Subject: Move asm/arch/irqs.h to mach/irqs.h This "move" is not so much a file move as just carrying over the current status of the irqs.h file from include/asm-arm/arch-s3c2410 to the file at arch/arm/mach-s3c2410/include/mach. For some reason both files existed and had become out of sync. NOTE: Some of these changes look fishy... please check these properly. Signed-off-by: Jonas Bonn --- arch/arm/mach-s3c2410/include/mach/gta01.h | 2 +- arch/arm/mach-s3c2410/include/mach/gta02.h | 2 +- arch/arm/mach-s3c2410/include/mach/irqs.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'arch/arm/mach-s3c2410/include') diff --git a/arch/arm/mach-s3c2410/include/mach/gta01.h b/arch/arm/mach-s3c2410/include/mach/gta01.h index b93380f6275..7af36a1bc86 100644 --- a/arch/arm/mach-s3c2410/include/mach/gta01.h +++ b/arch/arm/mach-s3c2410/include/mach/gta01.h @@ -2,7 +2,7 @@ #define _GTA01_H #include -#include +#include /* Different hardware revisions, passed in ATAG_REVISION by u-boot */ #define GTA01v3_SYSTEM_REV 0x00000130 diff --git a/arch/arm/mach-s3c2410/include/mach/gta02.h b/arch/arm/mach-s3c2410/include/mach/gta02.h index c376b899779..68f853ec2ac 100644 --- a/arch/arm/mach-s3c2410/include/mach/gta02.h +++ b/arch/arm/mach-s3c2410/include/mach/gta02.h @@ -2,7 +2,7 @@ #define _GTA02_H #include -#include +#include /* Different hardware revisions, passed in ATAG_REVISION by u-boot */ #define GTA02v1_SYSTEM_REV 0x00000310 diff --git a/arch/arm/mach-s3c2410/include/mach/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h index 78f6097e799..ff43c229b99 100644 --- a/arch/arm/mach-s3c2410/include/mach/irqs.h +++ b/arch/arm/mach-s3c2410/include/mach/irqs.h @@ -12,9 +12,9 @@ #ifndef __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H __FILE__ -#ifndef __ASM_ARM_IRQ_H -#error "Do not include this directly, instead #include " -#endif +//#ifndef __ASM_ARM_IRQ_H +//#error "Do not include this directly, instead #include " +//#endif /* we keep the first set of CPU IRQs out of the range of * the ISA space, so that the PC104 has them to itself -- cgit v1.2.3