forked from rpms/kernel
		
	Merge branch 'master' into baytrail
This commit is contained in:
		
						commit
						7511bcf2e6
					
				| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user