diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 10:55:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 10:55:39 -0400 |
| commit | 5a05e5bf204e729b79e9462785f2fa09d5126855 (patch) | |
| tree | 02a12cfad8c17835cc2689cb35a0fa979cedfc1e /include/asm-arm/arch-s3c2410/regs-iis.h | |
| parent | 08a55c01b504360d48b8123c87b383f7e6a2ef21 (diff) | |
| parent | d17f901defef635292f90a969dadfdbd95b0f104 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3778/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [simtec]
[ARM] 3783/1: S3C2412: fix IRQ_EINT0 to IRQ_EINT3 handling
[ARM] 3779/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [left]
[ARM] 3777/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [regs-*.h]
[ARM] 3776/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410
[ARM] 3775/1: S3C24XX: do not add same sysdev_driver to two classes
[ARM] 3774/1: S3C24XX: SMDK2413 has two machine IDs
[ARM] 3773/1: Add the HWCAP_VFP bit for the ARM926 CPUs
[ARM] 3772/1: Fix compilation error in mach-ixp4xx/nslu2*
[ARM] 3767/1: S3C24XX: remove changelog comments from arch/arm/mach-s3c2410
[ARM] 3766/1: Fix typo in ARM _raw_read_trylock
Diffstat (limited to 'include/asm-arm/arch-s3c2410/regs-iis.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/regs-iis.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-iis.h b/include/asm-arm/arch-s3c2410/regs-iis.h index 7fdde9b91cb..72cd2509822 100644 --- a/include/asm-arm/arch-s3c2410/regs-iis.h +++ b/include/asm-arm/arch-s3c2410/regs-iis.h | |||
| @@ -8,17 +8,7 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | * | 9 | * |
| 10 | * S3C2410 IIS register definition | 10 | * S3C2410 IIS register definition |
| 11 | * | 11 | */ |
| 12 | * Changelog: | ||
| 13 | * 19-06-2003 BJD Created file | ||
| 14 | * 26-06-2003 BJD Finished off definitions for register addresses | ||
| 15 | * 12-03-2004 BJD Updated include protection | ||
| 16 | * 07-03-2005 BJD Added FIFO size flags and S3C2440 MPLL | ||
| 17 | * 05-04-2005 LCVR Added IISFCON definitions for the S3C2400 | ||
| 18 | * 18-07-2005 DA Change IISCON_MPLL to IISMOD_MPLL | ||
| 19 | * Correct IISMOD_256FS and IISMOD_384FS | ||
| 20 | * Add IISCON_PSCEN | ||
| 21 | */ | ||
| 22 | 12 | ||
| 23 | #ifndef __ASM_ARCH_REGS_IIS_H | 13 | #ifndef __ASM_ARCH_REGS_IIS_H |
| 24 | #define __ASM_ARCH_REGS_IIS_H | 14 | #define __ASM_ARCH_REGS_IIS_H |