diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:04:11 +0900 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:04:11 +0900 |
commit | 32457942b90aabb9242b450f02d18d9c8d982916 (patch) | |
tree | 6472b77016f83f2ada7a7e2ca83a9803f313f1a8 /arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | |
parent | 6071399674e813d797d9f458ec8913b86c85398e (diff) | |
parent | f64bea4318a73e833d0a9b8400cc0f6cee957da3 (diff) | |
download | linux-32457942b90aabb9242b450f02d18d9c8d982916.tar.bz2 |
ARM: Merge for-2635/fb-updates1
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
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 @@ #define S3C2443_HCLKCON_DMA4 (1<<4) #define S3C2443_HCLKCON_DMA5 (1<<5) #define S3C2443_HCLKCON_CAMIF (1<<8) -#define S3C2443_HCLKCON_DISP (1<<9) -#define S3C2443_HCLKCON_LCDC (1<<10) +#define S3C2443_HCLKCON_LCDC (1<<9) #define S3C2443_HCLKCON_USBH (1<<11) #define S3C2443_HCLKCON_USBD (1<<12) #define S3C2443_HCLKCON_HSMMC (1<<16) |