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

Issues Search
    My Issues | Starred     Open | Closed | All

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

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/i386/config.flavour.chromiumos-i386 ('k') | no next file » | 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_64BIT=y 4 CONFIG_64BIT=y
5 CONFIG_8139CP=m 5 CONFIG_8139CP=m
6 CONFIG_8139TOO=m 6 CONFIG_8139TOO=m
7 CONFIG_8139TOO_8129=y 7 CONFIG_8139TOO_8129=y
8 CONFIG_8139TOO_PIO=y 8 CONFIG_8139TOO_PIO=y
9 CONFIG_8139TOO_TUNE_TWISTER=y 9 CONFIG_8139TOO_TUNE_TWISTER=y
10 CONFIG_8139_OLD_RX_RESET=y 10 CONFIG_8139_OLD_RX_RESET=y
11 CONFIG_ACENIC=m 11 CONFIG_ACENIC=m
12 # CONFIG_ACENIC_OMIT_TIGON_I is not set 12 # CONFIG_ACENIC_OMIT_TIGON_I is not set
13 CONFIG_ACERHDF=y 13 CONFIG_ACERHDF=y
14 CONFIG_ACER_WMI=m 14 CONFIG_ACER_WMI=m
15 CONFIG_ACPI=y 15 CONFIG_ACPI=y
16 CONFIG_ACPI_AC=y 16 CONFIG_ACPI_AC=y
17 # CONFIG_ACPI_ASUS is not set 17 # CONFIG_ACPI_ASUS is not set
18 CONFIG_ACPI_BATTERY=y 18 CONFIG_ACPI_BATTERY=y
19 CONFIG_ACPI_BLACKLIST_YEAR=0 19 CONFIG_ACPI_BLACKLIST_YEAR=0
20 CONFIG_ACPI_BUTTON=y 20 CONFIG_ACPI_BUTTON=y
21 CONFIG_ACPI_CHROMEOS=m 21 CONFIG_ACPI_CHROMEOS=y
22 CONFIG_ACPI_CONTAINER=y 22 CONFIG_ACPI_CONTAINER=y
23 # CONFIG_ACPI_CUSTOM_DSDT is not set 23 # CONFIG_ACPI_CUSTOM_DSDT is not set
24 # CONFIG_ACPI_DEBUG is not set 24 # CONFIG_ACPI_DEBUG is not set
25 CONFIG_ACPI_DOCK=y 25 CONFIG_ACPI_DOCK=y
26 CONFIG_ACPI_FAN=y 26 CONFIG_ACPI_FAN=y
27 CONFIG_ACPI_HOTPLUG_CPU=y 27 CONFIG_ACPI_HOTPLUG_CPU=y
28 # CONFIG_ACPI_PCI_SLOT is not set 28 # CONFIG_ACPI_PCI_SLOT is not set
29 # CONFIG_ACPI_POWER_METER is not set 29 # CONFIG_ACPI_POWER_METER is not set
30 CONFIG_ACPI_PROCESSOR=y 30 CONFIG_ACPI_PROCESSOR=y
31 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set 31 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
(...skipping 13 matching lines...) Expand all
45 CONFIG_AGP_AMD64=y 45 CONFIG_AGP_AMD64=y
46 CONFIG_AGP_INTEL=y 46 CONFIG_AGP_INTEL=y
47 # CONFIG_AGP_SIS is not set 47 # CONFIG_AGP_SIS is not set
48 # CONFIG_AGP_VIA is not set 48 # CONFIG_AGP_VIA is not set
49 CONFIG_AIRO=m 49 CONFIG_AIRO=m
50 CONFIG_ALLOW_EMPTY_E820=y 50 CONFIG_ALLOW_EMPTY_E820=y
51 CONFIG_AMD8111_ETH=m 51 CONFIG_AMD8111_ETH=m
52 # CONFIG_AMD_IOMMU is not set 52 # CONFIG_AMD_IOMMU is not set
53 CONFIG_AR9170_LEDS=y 53 CONFIG_AR9170_LEDS=y
54 CONFIG_AR9170_USB=m 54 CONFIG_AR9170_USB=m
55 CONFIG_ARCH_CPU_PROBE_RELEASE=y
55 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" 56 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
56 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 57 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
57 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y 58 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
58 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 59 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
59 CONFIG_ARCH_HAS_CPU_RELAX=y 60 CONFIG_ARCH_HAS_CPU_RELAX=y
60 CONFIG_ARCH_HAS_DEFAULT_IDLE=y 61 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
61 CONFIG_ARCH_HIBERNATION_POSSIBLE=y 62 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62 CONFIG_ARCH_MAY_HAVE_PC_FDC=y 63 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
63 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y 64 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
64 CONFIG_ARCH_POPULATES_NODE_MAP=y 65 CONFIG_ARCH_POPULATES_NODE_MAP=y
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 CONFIG_AUDIT_TREE=y 97 CONFIG_AUDIT_TREE=y
97 # CONFIG_AVERATEC_5100P is not set 98 # CONFIG_AVERATEC_5100P is not set
98 # CONFIG_BACKLIGHT_MBP_NVIDIA is not set 99 # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
99 # CONFIG_BACKLIGHT_PROGEAR is not set 100 # CONFIG_BACKLIGHT_PROGEAR is not set
100 # CONFIG_BACKLIGHT_SAHARA is not set 101 # CONFIG_BACKLIGHT_SAHARA is not set
101 # CONFIG_BLK_DEV_FD is not set 102 # CONFIG_BLK_DEV_FD is not set
102 # CONFIG_BLK_DEV_HD is not set 103 # CONFIG_BLK_DEV_HD is not set
103 CONFIG_BLOCK_COMPAT=y 104 CONFIG_BLOCK_COMPAT=y
104 CONFIG_BNX2=m 105 CONFIG_BNX2=m
105 CONFIG_BOUNCE=y 106 CONFIG_BOUNCE=y
106 # CONFIG_BROADCOM_PHY is not set 107 CONFIG_BROADCOM_PHY=y
107 CONFIG_BT_ATH3K=m 108 CONFIG_BT_ATH3K=m
108 CONFIG_BT_HCIBCM203X=m 109 CONFIG_BT_HCIBCM203X=m
109 CONFIG_BT_HCIBPA10X=m 110 CONFIG_BT_HCIBPA10X=m
110 # CONFIG_CALGARY_IOMMU is not set 111 # CONFIG_CALGARY_IOMMU is not set
111 CONFIG_CASSINI=m 112 CONFIG_CASSINI=m
112 CONFIG_CB710_CORE=m 113 CONFIG_CB710_CORE=m
113 CONFIG_CB710_DEBUG=y 114 CONFIG_CB710_DEBUG=y
114 CONFIG_CB710_DEBUG_ASSUMPTIONS=y 115 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
115 # CONFIG_CC_STACKPROTECTOR is not set 116 # CONFIG_CC_STACKPROTECTOR is not set
116 CONFIG_CHECK_SIGNATURE=y 117 CONFIG_CHECK_SIGNATURE=y
118 CONFIG_CHROMEOS=y
117 CONFIG_CHR_DEV_SG=y 119 CONFIG_CHR_DEV_SG=y
118 CONFIG_CLOCKSOURCE_WATCHDOG=y 120 CONFIG_CLOCKSOURCE_WATCHDOG=y
119 # CONFIG_CMDLINE_BOOL is not set 121 # CONFIG_CMDLINE_BOOL is not set
120 CONFIG_COMPAL_LAPTOP=m 122 CONFIG_COMPAL_LAPTOP=m
121 CONFIG_COMPAT=y 123 CONFIG_COMPAT=y
122 CONFIG_COMPAT_BINFMT_ELF=y 124 CONFIG_COMPAT_BINFMT_ELF=y
123 # CONFIG_COMPAT_BRK is not set 125 # CONFIG_COMPAT_BRK is not set
124 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y 126 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
125 CONFIG_COMPAT_NETLINK_MESSAGES=y 127 CONFIG_COMPAT_NETLINK_MESSAGES=y
126 # CONFIG_COMPAT_VDSO is not set 128 # CONFIG_COMPAT_VDSO is not set
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 CONFIG_PLX_HERMES=m 588 CONFIG_PLX_HERMES=m
587 CONFIG_PM_SLEEP_SMP=y 589 CONFIG_PM_SLEEP_SMP=y
588 CONFIG_PM_TRACE=y 590 CONFIG_PM_TRACE=y
589 CONFIG_PM_TRACE_RTC=y 591 CONFIG_PM_TRACE_RTC=y
590 CONFIG_PNP=y 592 CONFIG_PNP=y
591 CONFIG_PNPACPI=y 593 CONFIG_PNPACPI=y
592 CONFIG_PNP_DEBUG_MESSAGES=y 594 CONFIG_PNP_DEBUG_MESSAGES=y
593 # CONFIG_POWER_TRACER is not set 595 # CONFIG_POWER_TRACER is not set
594 # CONFIG_PREEMPT is not set 596 # CONFIG_PREEMPT is not set
595 CONFIG_PREEMPT_VOLUNTARY=y 597 CONFIG_PREEMPT_VOLUNTARY=y
596 # CONFIG_PRESERVED_RAM is not set 598 CONFIG_PRESERVED_RAM=y
597 CONFIG_PRISM54=m 599 CONFIG_PRISM54=m
598 # CONFIG_PROCESSOR_SELECT is not set 600 # CONFIG_PROCESSOR_SELECT is not set
599 CONFIG_PROC_KCORE=y 601 CONFIG_PROC_KCORE=y
600 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y 602 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
601 CONFIG_QLA3XXX=m 603 CONFIG_QLA3XXX=m
602 CONFIG_R6040=m 604 CONFIG_R6040=m
603 CONFIG_R8103=m 605 CONFIG_R8103=m
604 CONFIG_R8169=m 606 CONFIG_R8169=m
605 # CONFIG_RD_BZIP2 is not set 607 # CONFIG_RD_BZIP2 is not set
606 # CONFIG_RD_LZMA is not set 608 # CONFIG_RD_LZMA is not set
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 # CONFIG_X86_VSMP is not set 1035 # CONFIG_X86_VSMP is not set
1034 CONFIG_X86_WP_WORKS_OK=y 1036 CONFIG_X86_WP_WORKS_OK=y
1035 CONFIG_X86_XADD=y 1037 CONFIG_X86_XADD=y
1036 CONFIG_XFRM_USER=y 1038 CONFIG_XFRM_USER=y
1037 CONFIG_YELLOWFIN=m 1039 CONFIG_YELLOWFIN=m
1038 CONFIG_ZD1211RW=m 1040 CONFIG_ZD1211RW=m
1039 # CONFIG_ZD1211RW_DEBUG is not set 1041 # CONFIG_ZD1211RW_DEBUG is not set
1040 CONFIG_ZONE_DMA=y 1042 CONFIG_ZONE_DMA=y
1041 CONFIG_ZONE_DMA32=y 1043 CONFIG_ZONE_DMA32=y
1042 CONFIG_ZONE_DMA_FLAG=1 1044 CONFIG_ZONE_DMA_FLAG=1
OLDNEW
« no previous file with comments | « chromeos/config/i386/config.flavour.chromiumos-i386 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698