diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /include/asm-arm/arch-s3c2410/regs-udc.h | |
| parent | 3dd836a56de0d4f049438412959b905e1db4666e (diff) | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-arm/arch-s3c2410/regs-udc.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/regs-udc.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-udc.h b/include/asm-arm/arch-s3c2410/regs-udc.h index bf315b76325..3aa31a27da1 100644 --- a/include/asm-arm/arch-s3c2410/regs-udc.h +++ b/include/asm-arm/arch-s3c2410/regs-udc.h | |||
| @@ -6,13 +6,7 @@ | |||
| 6 | * modify it under the terms of the GNU General Public License as | 6 | * modify it under the terms of the GNU General Public License as |
| 7 | * published by the Free Software Foundation; either version 2 of | 7 | * published by the Free Software Foundation; either version 2 of |
| 8 | * the License, or (at your option) any later version. | 8 | * the License, or (at your option) any later version. |
| 9 | * | 9 | */ |
| 10 | * Changelog: | ||
| 11 | * 01-08-2004 Initial creation | ||
| 12 | * 12-09-2004 Cleanup for submission | ||
| 13 | * 24-10-2004 Fixed S3C2410_UDC_MAXP_REG definition | ||
| 14 | * 10-03-2005 Changed S3C2410_VA to S3C24XX_VA | ||
| 15 | */ | ||
| 16 | 10 | ||
| 17 | #ifndef __ASM_ARCH_REGS_UDC_H | 11 | #ifndef __ASM_ARCH_REGS_UDC_H |
| 18 | #define __ASM_ARCH_REGS_UDC_H | 12 | #define __ASM_ARCH_REGS_UDC_H |