diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:31:49 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:31:49 +0900 |
| commit | 6b8eda04ffdc24b68d379a32358f4f09a425a380 (patch) | |
| tree | 4343c4b891322dfebfb7061ae10c488c1747bbbb /arch/arm/plat-samsung | |
| parent | a639718b83867b3d4af3bf18c7e6a23d92b35f7a (diff) | |
| parent | 516607d64dd1efe77147e2856188d4318ac7fcce (diff) | |
| download | blackbird-op-linux-6b8eda04ffdc24b68d379a32358f4f09a425a380.tar.gz blackbird-op-linux-6b8eda04ffdc24b68d379a32358f4f09a425a380.zip | |
Merge branch 'next-s5pv310' into for-next
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/regs-serial.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index b1d82cc5e716..0d5bf8a20a63 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -12,7 +12,7 @@ obj- := # Objects we always build independent of SoC choice obj-y += init.o -obj-y += time.o +obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) += time.o obj-y += clock.o obj-y += pwm-clock.o obj-y += gpio.o 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 { unsigned short flags; upf_t uart_flags; /* default uart flags */ + unsigned int has_fracval; + unsigned long ucon; /* value of ucon for port */ unsigned long ulcon; /* value of ulcon for port */ unsigned long ufcon; /* value of ufcon for port */ |
