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 /include/asm-arm/arch-s3c2410/uncompress.h | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-arm/arch-s3c2410/uncompress.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/uncompress.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/include/asm-arm/arch-s3c2410/uncompress.h index 8e152a05e533..81b3e91c56ab 100644 --- a/include/asm-arm/arch-s3c2410/uncompress.h +++ b/include/asm-arm/arch-s3c2410/uncompress.h | |||
| @@ -8,15 +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 | * 22-May-2003 BJD Created | ||
| 14 | * 08-Sep-2003 BJD Moved to linux v2.6 | ||
| 15 | * 12-Mar-2004 BJD Updated header protection | ||
| 16 | * 12-Oct-2004 BJD Take account of debug uart configuration | ||
| 17 | * 15-Nov-2004 BJD Fixed uart configuration | ||
| 18 | * 22-Feb-2005 BJD Added watchdog to uncompress | ||
| 19 | * 04-Apr-2005 LCVR Added support to S3C2400 (no cpuid at GSTATUS1) | ||
| 20 | */ | 11 | */ |
| 21 | 12 | ||
| 22 | #ifndef __ASM_ARCH_UNCOMPRESS_H | 13 | #ifndef __ASM_ARCH_UNCOMPRESS_H |