diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-06-07 15:52:41 -0700 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-06-14 08:52:09 -0700 |
| commit | 30a47b3cda20f57e72699680a133d67b14b1365b (patch) | |
| tree | 4c345208450d5d211e56059d1a5bb40a5310584d | |
| parent | f632e0e7cdfdd45861449182cfb2d4366439b1a5 (diff) | |
UBUNTU: [Config] update configs following rebase to v2.6.35-rc2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ef03086fc22..3aed386b40c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -808,6 +808,7 @@ CONFIG_CRC7=m CONFIG_CRC_CCITT=m CONFIG_CRC_ITU_T=m CONFIG_CRC_T10DIF=y +CONFIG_CROSS_COMPILE="" CONFIG_CRYPTO=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y @@ -1215,9 +1216,11 @@ CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5100=m CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m CONFIG_EDAC_I82860=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I82975X=m +CONFIG_EDAC_MCE=y CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_R82600=m CONFIG_EDAC_X38=m @@ -1389,6 +1392,7 @@ CONFIG_FB_VIA=m # CONFIG_FB_VIRTUAL is not set CONFIG_FB_VOODOO1=m CONFIG_FB_VT8623=m +CONFIG_FB_XGI=m CONFIG_FCOE=m CONFIG_FCOE_FNIC=m CONFIG_FDDI=y @@ -4307,6 +4311,7 @@ CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_HTCPEN=m CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_INTEL_MID=m CONFIG_TOUCHSCREEN_MC13783=m CONFIG_TOUCHSCREEN_MCS5000=m CONFIG_TOUCHSCREEN_MK712=m |