diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
| commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
| tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /arch/arm/mach-s3c2410/s3c2410.h | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/arm/mach-s3c2410/s3c2410.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2410.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410.h b/arch/arm/mach-s3c2410/s3c2410.h index 73f1a2474a61..fbed084f26d0 100644 --- a/arch/arm/mach-s3c2410/s3c2410.h +++ b/arch/arm/mach-s3c2410/s3c2410.h | |||
| @@ -9,14 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | * | 11 | * |
| 12 | * Modifications: | ||
| 13 | * 18-Aug-2004 BJD Created initial version | ||
| 14 | * 20-Aug-2004 BJD Added s3c2410_board struct | ||
| 15 | * 04-Sep-2004 BJD Added s3c2410_init_uarts() call | ||
| 16 | * 17-Oct-2004 BJD Moved board out to cpu | ||
| 17 | * 04-Jan-2005 BJD Changed uart init | ||
| 18 | * 10-Jan-2005 BJD Removed timer to cpu.h, moved 2410 specific bits here | ||
| 19 | * 14-Jan-2005 BJD Added s3c2410_init_clocks call | ||
| 20 | */ | 12 | */ |
| 21 | 13 | ||
| 22 | #ifdef CONFIG_CPU_S3C2410 | 14 | #ifdef CONFIG_CPU_S3C2410 |