mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
This commit is contained in:
commit
29c08460d4
106 changed files with 8926 additions and 85 deletions
|
|
@ -459,7 +459,7 @@ config SERIAL_SAMSUNG_UARTS
|
|||
int
|
||||
depends on ARM && PLAT_S3C
|
||||
default 2 if ARCH_S3C2400
|
||||
default 4 if ARCH_S3C64XX || CPU_S3C2443
|
||||
default 4 if ARCH_S5PC1XX || ARCH_S3C64XX || CPU_S3C2443
|
||||
default 3
|
||||
help
|
||||
Select the number of available UART ports for the Samsung S3C
|
||||
|
|
@ -533,6 +533,13 @@ config SERIAL_S3C6400
|
|||
Serial port support for the Samsung S3C6400 and S3C6410
|
||||
SoCs
|
||||
|
||||
config SERIAL_S5PC100
|
||||
tristate "Samsung S5PC100 Serial port support"
|
||||
depends on SERIAL_SAMSUNG && CPU_S5PC100
|
||||
default y
|
||||
help
|
||||
Serial port support for the Samsung S5PC100 SoCs
|
||||
|
||||
config SERIAL_MAX3100
|
||||
tristate "MAX3100 support"
|
||||
depends on SPI
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
|
|||
obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
|
||||
obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o
|
||||
obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o
|
||||
obj-$(CONFIG_SERIAL_S5PC100) += s3c6400.o
|
||||
obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
|
||||
obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
|
||||
obj-$(CONFIG_SERIAL_MUX) += mux.o
|
||||
|
|
|
|||
Loading…
Reference in a new issue