diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 10:11:04 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 10:16:32 +0900 |
| commit | 431107ea5b680a24a4d01fbd3a178a3eb932f378 (patch) | |
| tree | 6515a616e8ed60480e169188e630936794be2c77 /arch/arm/mach-s3c6400/include/mach/regs-irq.h | |
| parent | ab5d97db1c6ced3e95c00d097931471707032b1f (diff) | |
| download | kernel_samsung_smdk4412-431107ea5b680a24a4d01fbd3a178a3eb932f378.zip kernel_samsung_smdk4412-431107ea5b680a24a4d01fbd3a178a3eb932f378.tar.gz kernel_samsung_smdk4412-431107ea5b680a24a4d01fbd3a178a3eb932f378.tar.bz2 | |
ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410
As per discussions with Russell King on linux-arm-kernel, it appears that
both mach-s3c6400 and mach-s3c6410 are so close together that they should
simply be merged into mach-s3c64xx.
Note, this patch does not eliminate any of the bits that are still common,
it is simply a move of the two directories together, any further common
code will be eliminated or moved in further patches.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c6400/include/mach/regs-irq.h')
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/regs-irq.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/regs-irq.h b/arch/arm/mach-s3c6400/include/mach/regs-irq.h deleted file mode 100644 index bcce68a..0000000 --- a/arch/arm/mach-s3c6400/include/mach/regs-irq.h +++ /dev/null @@ -1,20 +0,0 @@ -/* linux/arch/arm/mach-s3c6400/include/mach/regs-irq.h - * - * Copyright 2008 Openmoko, Inc. - * Copyright 2008 Simtec Electronics - * http://armlinux.simtec.co.uk/ - * Ben Dooks <ben@simtec.co.uk> - * - * S3C64XX - IRQ register definitions - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_REGS_IRQ_H -#define __ASM_ARCH_REGS_IRQ_H __FILE__ - -#include <asm/hardware/vic.h> - -#endif /* __ASM_ARCH_6400_REGS_IRQ_H */ |