Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chromeos/config/i386/config.common.i386

Issue 3664003: CHROMIUM: Align x86 config flavours (Closed) Base URL: http://git.chromium.org/git/kernel.git
Patch Set: Doing it again moves CONFIG_MAC80211_HAS_RC to config.common.chromeos Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/config/config.common.chromeos ('k') | chromeos/config/i386/config.flavour.chromeos-pinetrail-i386 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Config options generated by splitconfig 2 # Config options generated by splitconfig
3 # 3 #
4 # CONFIG_4KSTACKS is not set 4 # CONFIG_4KSTACKS is not set
5 # CONFIG_64BIT is not set 5 # CONFIG_64BIT is not set
6 CONFIG_8139CP=m 6 CONFIG_8139CP=m
7 CONFIG_8139TOO=m 7 CONFIG_8139TOO=m
8 CONFIG_8139TOO_8129=y 8 CONFIG_8139TOO_8129=y
9 CONFIG_8139TOO_PIO=y 9 CONFIG_8139TOO_PIO=y
10 CONFIG_8139TOO_TUNE_TWISTER=y 10 CONFIG_8139TOO_TUNE_TWISTER=y
11 CONFIG_8139_OLD_RX_RESET=y 11 CONFIG_8139_OLD_RX_RESET=y
12 CONFIG_ACENIC=m 12 CONFIG_ACENIC=m
13 # CONFIG_ACENIC_OMIT_TIGON_I is not set 13 # CONFIG_ACENIC_OMIT_TIGON_I is not set
14 CONFIG_ACERHDF=y 14 CONFIG_ACERHDF=y
15 CONFIG_ACER_WMI=m 15 CONFIG_ACER_WMI=m
16 CONFIG_ACPI=y 16 CONFIG_ACPI=y
17 CONFIG_ACPI_AC=y 17 CONFIG_ACPI_AC=y
18 # CONFIG_ACPI_ASUS is not set 18 # CONFIG_ACPI_ASUS is not set
19 CONFIG_ACPI_BATTERY=y 19 CONFIG_ACPI_BATTERY=y
20 CONFIG_ACPI_BLACKLIST_YEAR=0 20 CONFIG_ACPI_BLACKLIST_YEAR=0
21 CONFIG_ACPI_BUTTON=y 21 CONFIG_ACPI_BUTTON=y
22 CONFIG_ACPI_CHROMEOS=y 22 CONFIG_ACPI_CHROMEOS=y
23 CONFIG_CHROMEOS=y
24 CONFIG_ACPI_CONTAINER=y 23 CONFIG_ACPI_CONTAINER=y
25 # CONFIG_ACPI_CUSTOM_DSDT is not set 24 # CONFIG_ACPI_CUSTOM_DSDT is not set
26 # CONFIG_ACPI_DEBUG is not set 25 # CONFIG_ACPI_DEBUG is not set
27 CONFIG_ACPI_DOCK=y 26 CONFIG_ACPI_DOCK=y
28 CONFIG_ACPI_FAN=y 27 CONFIG_ACPI_FAN=y
29 CONFIG_ACPI_HOTPLUG_CPU=y 28 CONFIG_ACPI_HOTPLUG_CPU=y
30 # CONFIG_ACPI_PCI_SLOT is not set 29 # CONFIG_ACPI_PCI_SLOT is not set
31 # CONFIG_ACPI_POWER_METER is not set 30 # CONFIG_ACPI_POWER_METER is not set
32 CONFIG_ACPI_PROCESSOR=y 31 CONFIG_ACPI_PROCESSOR=y
33 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set 32 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
(...skipping 24 matching lines...) Expand all
58 CONFIG_ALLOW_EMPTY_E820=y 57 CONFIG_ALLOW_EMPTY_E820=y
59 CONFIG_AMD8111_ETH=m 58 CONFIG_AMD8111_ETH=m
60 # CONFIG_APM is not set 59 # CONFIG_APM is not set
61 # CONFIG_AR600x_CUSTOM_XXX is not set 60 # CONFIG_AR600x_CUSTOM_XXX is not set
62 CONFIG_AR600x_DEBUG_UART_TX_PIN=8 61 CONFIG_AR600x_DEBUG_UART_TX_PIN=8
63 CONFIG_AR600x_SD31_XXX=y 62 CONFIG_AR600x_SD31_XXX=y
64 # CONFIG_AR600x_SD32_XXX is not set 63 # CONFIG_AR600x_SD32_XXX is not set
65 # CONFIG_AR600x_WB31_XXX is not set 64 # CONFIG_AR600x_WB31_XXX is not set
66 CONFIG_AR9170_LEDS=y 65 CONFIG_AR9170_LEDS=y
67 CONFIG_AR9170_USB=m 66 CONFIG_AR9170_USB=m
67 CONFIG_ARCH_CPU_PROBE_RELEASE=y
68 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" 68 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
69 CONFIG_ARCH_FLATMEM_ENABLE=y 69 CONFIG_ARCH_FLATMEM_ENABLE=y
70 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y 70 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
71 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 71 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
72 CONFIG_ARCH_HAS_CPU_RELAX=y 72 CONFIG_ARCH_HAS_CPU_RELAX=y
73 CONFIG_ARCH_HAS_DEFAULT_IDLE=y 73 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
74 CONFIG_ARCH_HIBERNATION_POSSIBLE=y 74 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
75 CONFIG_ARCH_MAY_HAVE_PC_FDC=y 75 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
76 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 76 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
77 CONFIG_ARCH_POPULATES_NODE_MAP=y 77 CONFIG_ARCH_POPULATES_NODE_MAP=y
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 CONFIG_AUDIT_TREE=y 117 CONFIG_AUDIT_TREE=y
118 # CONFIG_AVERATEC_5100P is not set 118 # CONFIG_AVERATEC_5100P is not set
119 # CONFIG_BACKLIGHT_MBP_NVIDIA is not set 119 # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
120 # CONFIG_BACKLIGHT_PROGEAR is not set 120 # CONFIG_BACKLIGHT_PROGEAR is not set
121 # CONFIG_BACKLIGHT_SAHARA is not set 121 # CONFIG_BACKLIGHT_SAHARA is not set
122 # CONFIG_BINFMT_AOUT is not set 122 # CONFIG_BINFMT_AOUT is not set
123 # CONFIG_BLK_DEV_FD is not set 123 # CONFIG_BLK_DEV_FD is not set
124 # CONFIG_BLK_DEV_HD is not set 124 # CONFIG_BLK_DEV_HD is not set
125 CONFIG_BNX2=m 125 CONFIG_BNX2=m
126 CONFIG_BOUNCE=y 126 CONFIG_BOUNCE=y
127 CONFIG_BROADCOM_PHY=y
127 CONFIG_BT_ATH3K=m 128 CONFIG_BT_ATH3K=m
128 CONFIG_BT_HCIBCM203X=m 129 CONFIG_BT_HCIBCM203X=m
129 CONFIG_BT_HCIBPA10X=m 130 CONFIG_BT_HCIBPA10X=m
130 CONFIG_CASSINI=m 131 CONFIG_CASSINI=m
131 CONFIG_CB710_CORE=m 132 CONFIG_CB710_CORE=m
132 CONFIG_CB710_DEBUG=y 133 CONFIG_CB710_DEBUG=y
133 CONFIG_CB710_DEBUG_ASSUMPTIONS=y 134 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
134 # CONFIG_CC_STACKPROTECTOR is not set 135 # CONFIG_CC_STACKPROTECTOR is not set
135 CONFIG_CHECK_SIGNATURE=y 136 CONFIG_CHECK_SIGNATURE=y
137 CONFIG_CHROMEOS=y
136 CONFIG_CHR_DEV_SG=y 138 CONFIG_CHR_DEV_SG=y
137 CONFIG_CLOCKSOURCE_WATCHDOG=y 139 CONFIG_CLOCKSOURCE_WATCHDOG=y
138 # CONFIG_CMDLINE_BOOL is not set 140 # CONFIG_CMDLINE_BOOL is not set
139 CONFIG_COMPAL_LAPTOP=m 141 CONFIG_COMPAL_LAPTOP=m
140 # CONFIG_COMPAT_BRK is not set 142 # CONFIG_COMPAT_BRK is not set
141 # CONFIG_COMPAT_VDSO is not set 143 # CONFIG_COMPAT_VDSO is not set
142 # CONFIG_COMPUTONE is not set 144 # CONFIG_COMPUTONE is not set
143 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y 145 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
144 # CONFIG_CPA_DEBUG is not set 146 # CONFIG_CPA_DEBUG is not set
145 CONFIG_CPU_FREQ=y 147 CONFIG_CPU_FREQ=y
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 CONFIG_DMI=y 202 CONFIG_DMI=y
201 CONFIG_DMIID=y 203 CONFIG_DMIID=y
202 CONFIG_DM_VERITY=y 204 CONFIG_DM_VERITY=y
203 CONFIG_DNET=m 205 CONFIG_DNET=m
204 CONFIG_DOUBLEFAULT=y 206 CONFIG_DOUBLEFAULT=y
205 CONFIG_DRM=y 207 CONFIG_DRM=y
206 # CONFIG_DRM_I2C_CH7006 is not set 208 # CONFIG_DRM_I2C_CH7006 is not set
207 # CONFIG_DRM_I810 is not set 209 # CONFIG_DRM_I810 is not set
208 # CONFIG_DRM_I830 is not set 210 # CONFIG_DRM_I830 is not set
209 CONFIG_DRM_I915=y 211 CONFIG_DRM_I915=y
212 CONFIG_DRM_I915_DIRECT_BACKLIGHT=y
210 CONFIG_DRM_I915_KMS=y 213 CONFIG_DRM_I915_KMS=y
211 CONFIG_DRM_KMS_HELPER=y 214 CONFIG_DRM_KMS_HELPER=y
212 # CONFIG_DRM_MGA is not set 215 # CONFIG_DRM_MGA is not set
213 # CONFIG_DRM_NOUVEAU is not set 216 # CONFIG_DRM_NOUVEAU is not set
214 # CONFIG_DRM_R128 is not set 217 # CONFIG_DRM_R128 is not set
215 # CONFIG_DRM_RADEON is not set 218 # CONFIG_DRM_RADEON is not set
216 # CONFIG_DRM_SAVAGE is not set 219 # CONFIG_DRM_SAVAGE is not set
217 # CONFIG_DRM_SIS is not set 220 # CONFIG_DRM_SIS is not set
218 # CONFIG_DRM_TDFX is not set 221 # CONFIG_DRM_TDFX is not set
219 # CONFIG_DRM_VIA is not set 222 # CONFIG_DRM_VIA is not set
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 CONFIG_PLX_HERMES=m 618 CONFIG_PLX_HERMES=m
616 CONFIG_PM_SLEEP_SMP=y 619 CONFIG_PM_SLEEP_SMP=y
617 CONFIG_PM_TRACE=y 620 CONFIG_PM_TRACE=y
618 CONFIG_PM_TRACE_RTC=y 621 CONFIG_PM_TRACE_RTC=y
619 CONFIG_PNP=y 622 CONFIG_PNP=y
620 CONFIG_PNPACPI=y 623 CONFIG_PNPACPI=y
621 CONFIG_PNP_DEBUG_MESSAGES=y 624 CONFIG_PNP_DEBUG_MESSAGES=y
622 # CONFIG_POWER_TRACER is not set 625 # CONFIG_POWER_TRACER is not set
623 # CONFIG_PREEMPT is not set 626 # CONFIG_PREEMPT is not set
624 CONFIG_PREEMPT_VOLUNTARY=y 627 CONFIG_PREEMPT_VOLUNTARY=y
628 CONFIG_PRESERVED_RAM=y
625 CONFIG_PRISM54=m 629 CONFIG_PRISM54=m
626 # CONFIG_PROCESSOR_SELECT is not set 630 # CONFIG_PROCESSOR_SELECT is not set
627 CONFIG_PROC_KCORE=y 631 CONFIG_PROC_KCORE=y
628 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y 632 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
629 CONFIG_QLA3XXX=m 633 CONFIG_QLA3XXX=m
630 CONFIG_R6040=m 634 CONFIG_R6040=m
631 CONFIG_R8103=m 635 CONFIG_R8103=m
632 CONFIG_R8169=m 636 CONFIG_R8169=m
633 # CONFIG_RD_BZIP2 is not set 637 # CONFIG_RD_BZIP2 is not set
634 # CONFIG_RD_LZMA is not set 638 # CONFIG_RD_LZMA is not set
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 CONFIG_X86_VERBOSE_BOOTUP=y 1093 CONFIG_X86_VERBOSE_BOOTUP=y
1090 CONFIG_X86_WP_WORKS_OK=y 1094 CONFIG_X86_WP_WORKS_OK=y
1091 CONFIG_X86_XADD=y 1095 CONFIG_X86_XADD=y
1092 CONFIG_XFRM_USER=y 1096 CONFIG_XFRM_USER=y
1093 CONFIG_YELLOWFIN=m 1097 CONFIG_YELLOWFIN=m
1094 CONFIG_ZD1211RW=m 1098 CONFIG_ZD1211RW=m
1095 # CONFIG_ZD1211RW_DEBUG is not set 1099 # CONFIG_ZD1211RW_DEBUG is not set
1096 CONFIG_ZONE_DMA=y 1100 CONFIG_ZONE_DMA=y
1097 # CONFIG_ZONE_DMA32 is not set 1101 # CONFIG_ZONE_DMA32 is not set
1098 CONFIG_ZONE_DMA_FLAG=1 1102 CONFIG_ZONE_DMA_FLAG=1
OLDNEW
« no previous file with comments | « chromeos/config/config.common.chromeos ('k') | chromeos/config/i386/config.flavour.chromeos-pinetrail-i386 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698