diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-04-19 06:39:18 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 09:48:27 -0600 |
| commit | e7887d540fb64e33e1a5c759f5e6af8ed3221c85 (patch) | |
| tree | 7b076a50996454bbe08785d6ed55c320c1769746 | |
| parent | 50bc11c5a203af4829168a712fb1796308031193 (diff) | |
UBUNTU: [Config] updateconfigs following rebase to v2.6.39-rc4
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 65fc75893cc..8b759d0119c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1081,7 +1081,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_DRIVER is not set -CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set @@ -1803,6 +1802,7 @@ CONFIG_HERMES_CACHE_FW_ON_INIT=y # CONFIG_HERMES_PRISM is not set CONFIG_HFSPLUS_FS=m CONFIG_HFS_FS=m +CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HID=m CONFIG_HIDRAW=y |