diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | |
| parent | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (diff) | |
| parent | 6daa642d9b8ec762b3c5641cd5e5fa855a5405bf (diff) | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h index d87ebe0cb625..08ab9dfb6ae6 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | |||
| @@ -83,8 +83,7 @@ | |||
| 83 | #define S3C2443_HCLKCON_DMA4 (1<<4) | 83 | #define S3C2443_HCLKCON_DMA4 (1<<4) |
| 84 | #define S3C2443_HCLKCON_DMA5 (1<<5) | 84 | #define S3C2443_HCLKCON_DMA5 (1<<5) |
| 85 | #define S3C2443_HCLKCON_CAMIF (1<<8) | 85 | #define S3C2443_HCLKCON_CAMIF (1<<8) |
| 86 | #define S3C2443_HCLKCON_DISP (1<<9) | 86 | #define S3C2443_HCLKCON_LCDC (1<<9) |
| 87 | #define S3C2443_HCLKCON_LCDC (1<<10) | ||
| 88 | #define S3C2443_HCLKCON_USBH (1<<11) | 87 | #define S3C2443_HCLKCON_USBH (1<<11) |
| 89 | #define S3C2443_HCLKCON_USBD (1<<12) | 88 | #define S3C2443_HCLKCON_USBD (1<<12) |
| 90 | #define S3C2443_HCLKCON_HSMMC (1<<16) | 89 | #define S3C2443_HCLKCON_HSMMC (1<<16) |