diff options
| author | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-08-17 16:06:35 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-08-17 16:07:07 -0400 |
| commit | da80d72ecea221386e6642122ab332f2aaa457ce (patch) | |
| tree | c3641cd7e7701ae4646367c395e8569aeafb5d35 /config-x86-generic | |
| parent | c7a89c25e0dbac3f4d1e2f40ae910f71ebd224b6 (diff) | |
| download | kernel-da80d72ecea221386e6642122ab332f2aaa457ce.tar.gz kernel-da80d72ecea221386e6642122ab332f2aaa457ce.tar.xz kernel-da80d72ecea221386e6642122ab332f2aaa457ce.zip | |
First pass at 2.6.36-rc1
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic index 58a8cf11b..5f14f346a 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -393,6 +393,7 @@ CONFIG_SENSORS_I5K_AMB=m CONFIG_HP_WATCHDOG=m CONFIG_OLPC=y +CONFIG_OLPC_OPENFIRMWARE=y CONFIG_BATTERY_OLPC=y CONFIG_MOUSE_PS2_OLPC=y @@ -479,6 +480,20 @@ CONFIG_TOSHIBA_BT_RFKILL=m CONFIG_VGA_SWITCHEROO=y CONFIG_LPC_SCH=m -CONFIG_INTEL_IDLE=m - CONFIG_PCI_CNB20LE_QUIRK=y + +CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_APEI_ERST_DEBUG is not set +CONFIG_INTEL_IDLE=y +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +CONFIG_SENSORS_PKGTEMP=m +CONFIG_F71808E_WDT=m +CONFIG_HPWDT_NMI_DECODING=y +# CONFIG_MFD_TPS6586X is not set +# CONFIG_INTEL_MID_DMAC is not set +CONFIG_PCH_DMA=m +CONFIG_XEN_PLATFORM_PCI=m +# CONFIG_ACPI_QUICKSTART is not set +CONFIG_IDEAPAD_ACPI=m +CONFIG_INTEL_IPS=m + |