diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /include/asm-arm/arch-s3c2410/regs-timer.h | |
| parent | 3dd836a56de0d4f049438412959b905e1db4666e (diff) | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-arm/arch-s3c2410/regs-timer.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/regs-timer.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-timer.h b/include/asm-arm/arch-s3c2410/regs-timer.h index 169064e27520..731918e77831 100644 --- a/include/asm-arm/arch-s3c2410/regs-timer.h +++ b/include/asm-arm/arch-s3c2410/regs-timer.h | |||
| @@ -8,13 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | * | 9 | * |
| 10 | * S3C2410 Timer configuration | 10 | * S3C2410 Timer configuration |
| 11 | * | ||
| 12 | * Changelog: | ||
| 13 | * 05-06-2003 BJD Created file | ||
| 14 | * 26-06-2003 BJD Added more timer definitions to mux / control | ||
| 15 | * 12-03-2004 BJD Updated include protection | ||
| 16 | * 10-02-2005 BJD Added S3C2410_TCFG1_MUX4_SHIFT (Guillaume Gourat) | ||
| 17 | * 10-03-2005 LCVR Changed S3C2410_VA to S3C24XX_VA | ||
| 18 | */ | 11 | */ |
| 19 | 12 | ||
| 20 | 13 | ||