~hc/RK356X_SDK_RELEASE.git

..	..	@@ -18,7 +18,6 @@
18	18	CONFIG_SMP=y
19	19	CONFIG_HOTPLUG_CPU=y
20	20	CONFIG_IA64_MCA_RECOVERY=y
21		-CONFIG_PERFMON=y
22	21	CONFIG_IA64_PALINFO=y
23	22	CONFIG_KEXEC=y
24	23	CONFIG_CRASH_DUMP=y
..	..	@@ -44,14 +43,11 @@
44	43	CONFIG_BLK_DEV_CRYPTOLOOP=m
45	44	CONFIG_BLK_DEV_NBD=m
46	45	CONFIG_BLK_DEV_RAM=y
47		-CONFIG_SGI_IOC4=y
48	46	CONFIG_SGI_XP=m
49		-CONFIG_IDE=y
50		-CONFIG_BLK_DEV_IDECD=y
51		-CONFIG_BLK_DEV_GENERIC=y
52		-CONFIG_BLK_DEV_CMD64X=y
53		-CONFIG_BLK_DEV_PIIX=y
54		-CONFIG_BLK_DEV_SGIIOC4=y
	47	+CONFIG_ATA=y
	48	+CONFIG_ATA_GENERIC=y
	49	+CONFIG_PATA_CMD64X=y
	50	+CONFIG_ATA_PIIX=y
55	51	CONFIG_BLK_DEV_SD=y
56	52	CONFIG_CHR_DEV_ST=m
57	53	CONFIG_BLK_DEV_SR=m
..	..	@@ -59,8 +55,6 @@
59	55	CONFIG_SCSI_FC_ATTRS=y
60	56	CONFIG_SCSI_SYM53C8XX_2=y
61	57	CONFIG_SCSI_QLOGIC_1280=y
62		-CONFIG_ATA=y
63		-CONFIG_ATA_PIIX=y
64	58	CONFIG_SATA_VITESSE=y
65	59	CONFIG_MD=y
66	60	CONFIG_BLK_DEV_MD=m
..	..	@@ -90,24 +84,19 @@
90	84	# CONFIG_SERIO_SERPORT is not set
91	85	CONFIG_GAMEPORT=m
92	86	CONFIG_SERIAL_NONSTANDARD=y
93		-CONFIG_SGI_SNSC=y
94		-CONFIG_SGI_TIOCX=y
95		-CONFIG_SGI_MBCS=m
96	87	CONFIG_SERIAL_8250=y
97	88	CONFIG_SERIAL_8250_CONSOLE=y
98	89	CONFIG_SERIAL_8250_NR_UARTS=6
99	90	CONFIG_SERIAL_8250_EXTENDED=y
100	91	CONFIG_SERIAL_8250_SHARE_IRQ=y
101		-CONFIG_SERIAL_SGI_L1_CONSOLE=y
102		-CONFIG_SERIAL_SGI_IOC4=y
103	92	# CONFIG_HW_RANDOM is not set
104		-CONFIG_EFI_RTC=y
	93	+CONFIG_RTC_CLASS=y
	94	+CONFIG_RTC_DRV_EFI=y
105	95	CONFIG_RAW_DRIVER=m
106	96	CONFIG_HPET=y
107	97	CONFIG_AGP=m
108	98	CONFIG_AGP_I460=m
109	99	CONFIG_AGP_HP_ZX1=m
110		-CONFIG_AGP_SGI_TIOCA=m
111	100	CONFIG_DRM=m
112	101	CONFIG_DRM_TDFX=m
113	102	CONFIG_DRM_R128=m