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/mach-rx3715.c | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-rx3715.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-rx3715.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c2410/mach-rx3715.c b/arch/arm/mach-s3c2410/mach-rx3715.c index 306afc1d7cd3..23d7c052013c 100644 --- a/arch/arm/mach-s3c2410/mach-rx3715.c +++ b/arch/arm/mach-s3c2410/mach-rx3715.c | |||
| @@ -9,15 +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 | * 16-Sep-2004 BJD Copied from mach-h1940.c | ||
| 14 | * 25-Oct-2004 BJD Updates for 2.6.10-rc1 | ||
| 15 | * 10-Jan-2005 BJD Removed include of s3c2410.h s3c2440.h | ||
| 16 | * 14-Jan-2005 BJD Added new clock init | ||
| 17 | * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA | ||
| 18 | * 14-Mar-2005 BJD Fixed __iomem warnings | ||
| 19 | * 20-Sep-2005 BJD Added static to non-exported items | ||
| 20 | * 31-Oct-2005 BJD Added LCD setup for framebuffer | ||
| 21 | */ | 12 | */ |
| 22 | 13 | ||
| 23 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |