aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorSeth Forshee <seth.forshee@canonical.com>2011-07-06 08:21:14 -0500
committerJohn Rigby <john.rigby@linaro.org>2011-07-25 14:40:59 -0600
commite78c64928f5737056128eb35de730934f651e7ca (patch)
tree7139e1cc33232b5e0039370b8132afa279545eab /debian.master
parent032d4431f4b75d35d12e1afc8ab00d216b4788e5 (diff)
UBUNTU: [Config] CONFIG_{ASUS,ASUS_NB,EEEPC}_WMI=m
BugLink: http://bugs.launchpad.net/bugs/805218 These options were split from the single CONFIG_EEEPC_WMI option after 2.6.38 and were mistakenly disabled in the transition to oneiric. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/config/config.common.ubuntu4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b0cea758dd2..410581c3eae 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -329,7 +329,8 @@ CONFIG_ARM_THUMB=y
CONFIG_ARM_UNWIND=y
# CONFIG_ARPD is not set
CONFIG_ASUS_LAPTOP=m
-# CONFIG_ASUS_WMI is not set
+CONFIG_ASUS_NB_WMI=m
+CONFIG_ASUS_WMI=m
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
CONFIG_ASYNC_PQ=m
@@ -1412,6 +1413,7 @@ CONFIG_EDAC_X38=m
CONFIG_EDD=y
CONFIG_EDD_OFF=y
CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
CONFIG_EEH=y
CONFIG_EEPROM_93CX6=m
CONFIG_EEPROM_AT24=m