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/regs-iic.h | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-arm/arch-s3c2410/regs-iic.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/regs-iic.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-iic.h b/include/asm-arm/arch-s3c2410/regs-iic.h index fed3288e2046..2ae29522f253 100644 --- a/include/asm-arm/arch-s3c2410/regs-iic.h +++ b/include/asm-arm/arch-s3c2410/regs-iic.h | |||
| @@ -8,10 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | * | 9 | * |
| 10 | * S3C2410 I2C Controller | 10 | * S3C2410 I2C Controller |
| 11 | * | ||
| 12 | * Changelog: | ||
| 13 | * 03-Oct-2004 BJD Initial include for Linux | ||
| 14 | * 08-Nov-2004 BJD Added S3C2440 filter register | ||
| 15 | */ | 11 | */ |
| 16 | 12 | ||
| 17 | #ifndef __ASM_ARCH_REGS_IIC_H | 13 | #ifndef __ASM_ARCH_REGS_IIC_H |