| Index: chromeos/config/i386/config.common.i386
|
| diff --git a/chromeos/config/i386/config.common.i386 b/chromeos/config/i386/config.common.i386
|
| index d26a0d7e7f18823f25307aba9c85cfc4e357ce22..dd6c3becb07150467e5b920336faf1564f93837d 100644
|
| --- a/chromeos/config/i386/config.common.i386
|
| +++ b/chromeos/config/i386/config.common.i386
|
| @@ -20,7 +20,6 @@ CONFIG_ACPI_BATTERY=y
|
| CONFIG_ACPI_BLACKLIST_YEAR=0
|
| CONFIG_ACPI_BUTTON=y
|
| CONFIG_ACPI_CHROMEOS=y
|
| -CONFIG_CHROMEOS=y
|
| CONFIG_ACPI_CONTAINER=y
|
| # CONFIG_ACPI_CUSTOM_DSDT is not set
|
| # CONFIG_ACPI_DEBUG is not set
|
| @@ -65,6 +64,7 @@ CONFIG_AR600x_SD31_XXX=y
|
| # CONFIG_AR600x_WB31_XXX is not set
|
| CONFIG_AR9170_LEDS=y
|
| CONFIG_AR9170_USB=m
|
| +CONFIG_ARCH_CPU_PROBE_RELEASE=y
|
| CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
|
| CONFIG_ARCH_FLATMEM_ENABLE=y
|
| CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
|
| @@ -124,6 +124,7 @@ CONFIG_AUDIT_TREE=y
|
| # CONFIG_BLK_DEV_HD is not set
|
| CONFIG_BNX2=m
|
| CONFIG_BOUNCE=y
|
| +CONFIG_BROADCOM_PHY=y
|
| CONFIG_BT_ATH3K=m
|
| CONFIG_BT_HCIBCM203X=m
|
| CONFIG_BT_HCIBPA10X=m
|
| @@ -133,6 +134,7 @@ CONFIG_CB710_DEBUG=y
|
| CONFIG_CB710_DEBUG_ASSUMPTIONS=y
|
| # CONFIG_CC_STACKPROTECTOR is not set
|
| CONFIG_CHECK_SIGNATURE=y
|
| +CONFIG_CHROMEOS=y
|
| CONFIG_CHR_DEV_SG=y
|
| CONFIG_CLOCKSOURCE_WATCHDOG=y
|
| # CONFIG_CMDLINE_BOOL is not set
|
| @@ -207,6 +209,7 @@ CONFIG_DRM=y
|
| # CONFIG_DRM_I810 is not set
|
| # CONFIG_DRM_I830 is not set
|
| CONFIG_DRM_I915=y
|
| +CONFIG_DRM_I915_DIRECT_BACKLIGHT=y
|
| CONFIG_DRM_I915_KMS=y
|
| CONFIG_DRM_KMS_HELPER=y
|
| # CONFIG_DRM_MGA is not set
|
| @@ -622,6 +625,7 @@ CONFIG_PNP_DEBUG_MESSAGES=y
|
| # CONFIG_POWER_TRACER is not set
|
| # CONFIG_PREEMPT is not set
|
| CONFIG_PREEMPT_VOLUNTARY=y
|
| +CONFIG_PRESERVED_RAM=y
|
| CONFIG_PRISM54=m
|
| # CONFIG_PROCESSOR_SELECT is not set
|
| CONFIG_PROC_KCORE=y
|
|
|