diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/asm-arm/arch-s3c2410/regs-dsc.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'include/asm-arm/arch-s3c2410/regs-dsc.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/regs-dsc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/include/asm-arm/arch-s3c2410/regs-dsc.h index a023b0434efe..ba13a2c9e547 100644 --- a/include/asm-arm/arch-s3c2410/regs-dsc.h +++ b/include/asm-arm/arch-s3c2410/regs-dsc.h | |||
| @@ -170,7 +170,7 @@ | |||
| 170 | #define S3C2440_DSC1_CS1_4mA (3<<2) | 170 | #define S3C2440_DSC1_CS1_4mA (3<<2) |
| 171 | #define S3C2440_DSC1_CS1_MASK (3<<2) | 171 | #define S3C2440_DSC1_CS1_MASK (3<<2) |
| 172 | 172 | ||
| 173 | #define S3C2440_DSC1_CS0 (S3C2440_SELECT_DSC1 | 0 | 173 | #define S3C2440_DSC1_CS0 (S3C2440_SELECT_DSC1 | 0) |
| 174 | #define S3C2440_DSC1_CS0_10mA (0<<0) | 174 | #define S3C2440_DSC1_CS0_10mA (0<<0) |
| 175 | #define S3C2440_DSC1_CS0_8mA (1<<0) | 175 | #define S3C2440_DSC1_CS0_8mA (1<<0) |
| 176 | #define S3C2440_DSC1_CS0_6mA (2<<0) | 176 | #define S3C2440_DSC1_CS0_6mA (2<<0) |