diff --git a/debian/changelog b/debian/changelog index 377914fab..3d7f8df0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ linux (3.13.4-2) UNRELEASED; urgency=medium * [powerpc] Change I2C_POWERMAC from module to built-in (Closes: #713943) * [mips] rtl8187: fix regression on MIPS without coherent DMA (Closes: #739978) + * [x86] Enable CHROME_PLATFORMS and re-enable CHROMEOS_LAPTOP as module + (Closes: #740042) -- Ben Hutchings Sat, 22 Feb 2014 19:15:01 +0000 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 1800c28e0..48a196a29 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1149,6 +1149,12 @@ CONFIG_I82092=m CONFIG_TCIC=m # CONFIG_PCMCIA_DEBUG is not set +## +## file: drivers/platform/chromeos/Kconfig +## +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m + ## ## file: drivers/platform/x86/Kconfig ## @@ -1156,7 +1162,6 @@ CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m -CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m