diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-26 11:10:13 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-26 11:10:13 -0800 |
| commit | 7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2 (patch) | |
| tree | c2e8881f451a64569cd9f42644ddfd490231d3e6 | |
| parent | 187aae4b6b5b0a413ec27a28cb892cee9f2e7050 (diff) | |
| parent | cd44fa829c5e8255bf623a4b072cf85bb61b3092 (diff) | |
| download | kernel-7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2.tar.gz kernel-7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2.tar.xz kernel-7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2.zip | |
Merge branch 'master' into baytrail
| -rw-r--r-- | config-arm-generic | 1 | ||||
| -rw-r--r-- | config-armv7-generic | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic index 5c4c909b7..c0fa94ddd 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -51,6 +51,7 @@ CONFIG_ARM_SMMU=y CONFIG_MMC_ARMMMCI=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_8250_DW=y CONFIG_SERIO_AMBAKMI=y CONFIG_OC_ETM=y CONFIG_FB_ARMCLCD=y diff --git a/config-armv7-generic b/config-armv7-generic index 5a90b29b3..cd5f89b33 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -151,7 +151,6 @@ CONFIG_ARM_TIMER_SP804=y CONFIG_SERIO_AMBAKMI=m CONFIG_SERIAL_AMBA_PL010=y CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_MRST_MAX3110=m CONFIG_RTC_DRV_PL030=y |