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-smdk2410.c | |
parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
download | talos-op-linux-97148ba2235e334e57d05fa07045cf3e6629763c.tar.gz talos-op-linux-97148ba2235e334e57d05fa07045cf3e6629763c.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-smdk2410.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-smdk2410.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c index 25f7e9f4dcee..b3b0171d5052 100644 --- a/arch/arm/mach-s3c2410/mach-smdk2410.c +++ b/arch/arm/mach-s3c2410/mach-smdk2410.c @@ -27,10 +27,6 @@ * derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by * Ben Dooks <ben@simtec.co.uk> * - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA - * 20-Sep-2005 BJD Added static to non-exported items - * 01-Apr-2006 BJD Moved init code to common smdk - * ***********************************************************************/ #include <linux/kernel.h> |