diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:31:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:31:49 -0400 |
| commit | 6b8eda04ffdc24b68d379a32358f4f09a425a380 (patch) | |
| tree | 4343c4b891322dfebfb7061ae10c488c1747bbbb /arch/arm/plat-samsung/include | |
| parent | a639718b83867b3d4af3bf18c7e6a23d92b35f7a (diff) | |
| parent | 516607d64dd1efe77147e2856188d4318ac7fcce (diff) | |
Merge branch 'next-s5pv310' into for-next
Diffstat (limited to 'arch/arm/plat-samsung/include')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/regs-serial.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h index a6eba8496b24..788837e99cb3 100644 --- a/arch/arm/plat-samsung/include/plat/regs-serial.h +++ b/arch/arm/plat-samsung/include/plat/regs-serial.h | |||
| @@ -259,6 +259,8 @@ struct s3c2410_uartcfg { | |||
| 259 | unsigned short flags; | 259 | unsigned short flags; |
| 260 | upf_t uart_flags; /* default uart flags */ | 260 | upf_t uart_flags; /* default uart flags */ |
| 261 | 261 | ||
| 262 | unsigned int has_fracval; | ||
| 263 | |||
| 262 | unsigned long ucon; /* value of ucon for port */ | 264 | unsigned long ucon; /* value of ucon for port */ |
| 263 | unsigned long ulcon; /* value of ulcon for port */ | 265 | unsigned long ulcon; /* value of ulcon for port */ |
| 264 | unsigned long ufcon; /* value of ufcon for port */ | 266 | unsigned long ufcon; /* value of ufcon for port */ |