diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 18:03:21 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 18:03:21 +0200 |
commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /include/asm-arm/arch-s3c2410/map.h | |
parent | [PATCH] pata_amd: Check enable bits on Nvidia (diff) | |
parent | Merge branch 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
download | linux-97148ba2235e334e57d05fa07045cf3e6629763c.tar.xz linux-97148ba2235e334e57d05fa07045cf3e6629763c.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-arm/arch-s3c2410/map.h')
-rw-r--r-- | include/asm-arm/arch-s3c2410/map.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-arm/arch-s3c2410/map.h b/include/asm-arm/arch-s3c2410/map.h index fae2766ff32b..27ba0ac3fdd5 100644 --- a/include/asm-arm/arch-s3c2410/map.h +++ b/include/asm-arm/arch-s3c2410/map.h @@ -8,13 +8,6 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. - * - * Changelog: - * 12-May-2003 BJD Created file - * 06-Jan-2003 BJD Linux 2.6.0 version, moved bast specifics out - * 10-Feb-2005 BJD Added CAMIF definition from guillaume.gourat@nexvision.tv - * 10-Mar-2005 LCVR Added support to S3C2400, changed {VA,SZ} names - * 15-Jan-2006 LCVR Added S3C24XX_PA macros for common S3C24XX resources */ #ifndef __ASM_ARCH_MAP_H |