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/anubis-cpld.h | |
| parent | 6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (diff) | |
| parent | 1802ca745280b916cda4090e459741b8c9b3e8d0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/asm-arm/arch-s3c2410/anubis-cpld.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/anubis-cpld.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-arm/arch-s3c2410/anubis-cpld.h b/include/asm-arm/arch-s3c2410/anubis-cpld.h index 5675b1796b55..40e8e270d337 100644 --- a/include/asm-arm/arch-s3c2410/anubis-cpld.h +++ b/include/asm-arm/arch-s3c2410/anubis-cpld.h | |||
| @@ -9,9 +9,6 @@ | |||
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | * | ||
| 13 | * Changelog: | ||
| 14 | * | ||
| 15 | */ | 12 | */ |
| 16 | 13 | ||
| 17 | #ifndef __ASM_ARCH_ANUBISCPLD_H | 14 | #ifndef __ASM_ARCH_ANUBISCPLD_H |