diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-13 09:55:09 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-13 09:55:09 -0400 |
| commit | 0bc0748dfbefacce9c6b67ab23f2c80133b598f7 (patch) | |
| tree | 76946adc08a26973fcdb39fe0eb3ef5e1f8f121d /include/asm-arm/arch-s3c2410/system.h | |
| parent | b6397893a5ed81970e803d61ee2f1a0e79f87438 (diff) | |
| parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-arm/arch-s3c2410/system.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/system.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/asm-arm/arch-s3c2410/system.h b/include/asm-arm/arch-s3c2410/system.h index 9b0d85024cb4..718246d85952 100644 --- a/include/asm-arm/arch-s3c2410/system.h +++ b/include/asm-arm/arch-s3c2410/system.h | |||
| @@ -8,14 +8,7 @@ | |||
| 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 | * | 11 | */ |
| 12 | * Changelog: | ||
| 13 | * 12-May-2003 BJD Created file | ||
| 14 | * 14-May-2003 BJD Removed idle to aid debugging | ||
| 15 | * 12-Jun-2003 BJD Added reset via watchdog | ||
| 16 | * 04-Sep-2003 BJD Moved to v2.6 | ||
| 17 | * 28-Oct-2004 BJD Added over-ride for idle, and fixed reset panic() | ||
| 18 | */ | ||
| 19 | 12 | ||
| 20 | #include <asm/hardware.h> | 13 | #include <asm/hardware.h> |
| 21 | #include <asm/io.h> | 14 | #include <asm/io.h> |