diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
| commit | 8083e1656211eb1487329923d592ee061d08d7b3 (patch) | |
| tree | 92a44787484996b82365fab21f2dec960ab4f2d3 /include/asm-arm/arch-s3c2410/vr1000-map.h | |
| parent | 6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (diff) | |
| parent | 1802ca745280b916cda4090e459741b8c9b3e8d0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/asm-arm/arch-s3c2410/vr1000-map.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/vr1000-map.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-arm/arch-s3c2410/vr1000-map.h b/include/asm-arm/arch-s3c2410/vr1000-map.h index 867c9355fd39..1fe4db36c834 100644 --- a/include/asm-arm/arch-s3c2410/vr1000-map.h +++ b/include/asm-arm/arch-s3c2410/vr1000-map.h | |||
| @@ -8,12 +8,6 @@ | |||
| 8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
| 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 | * | ||
| 12 | * Changelog: | ||
| 13 | * 06-Jan-2003 BJD Linux 2.6.0 version, split specifics from arch/map.h | ||
| 14 | * 12-Mar-2004 BJD Fixed header include protection | ||
| 15 | * 19-Mar-2004 BJD Copied to VR1000 machine headers. | ||
| 16 | * 19-Jan-2005 BJD Updated map definitions | ||
| 17 | */ | 11 | */ |
| 18 | 12 | ||
| 19 | /* needs arch/map.h including with this */ | 13 | /* needs arch/map.h including with this */ |