From patchwork Wed Jun 27 12:50:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [9/9] UBUNTU: [Config] Updateconfigs From: Ike Panhc X-Patchwork-Id: 167644 Message-Id: <1340801439-17382-1-git-send-email-ike.pan@canonical.com> To: kernel-team@lists.ubuntu.com Date: Wed, 27 Jun 2012 20:50:39 +0800 BugLink: http://launchpad.net/bugs/1008345 Several new configs are introduced for highbank CONFIG_HAVE_SCHED_CLOCK=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_EDAC_HIGHBANK_MC=y CONFIG_EDAC_HIGHBANK_L2=y Other flavours are un-touched. Signed-off-by: Ike Panhc --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 3 ++- debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64/config.common.ppc64 | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 441431d..911618b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -55,6 +55,7 @@ CONFIG_DM_RAID45=m CONFIG_DRM_PSB=m # CONFIG_DVB_FE_CUSTOMISE is not set # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_EDAC_MM_EDAC=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_EVM=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 4af04f3..8aff133 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -52,6 +52,7 @@ CONFIG_DM9000=m CONFIG_DVB_FE_CUSTOMISE=y # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_DW_DMAC=m +CONFIG_EDAC_MM_EDAC=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_EVM=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 7f6c37a..e3663fd 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -22,6 +22,7 @@ CONFIG_DM9000=m # CONFIG_DM_RAID45 is not set CONFIG_DVB_FE_CUSTOMISE=y # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_EDAC_MM_EDAC=y CONFIG_FAT_FS=y # CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6ffa0a8..c23c2aa 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1489,6 +1489,8 @@ CONFIG_EDAC_CPC925=m CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_E752X=m CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_HIGHBANK_L2=y +CONFIG_EDAC_HIGHBANK_MC=y CONFIG_EDAC_I3000=m CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m @@ -1500,7 +1502,6 @@ CONFIG_EDAC_I82860=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I82975X=m CONFIG_EDAC_MCE_INJ=m -CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_PASEMI=m CONFIG_EDAC_R82600=m CONFIG_EDAC_SBRIDGE=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index a5db56a..c1979d8 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -55,6 +55,7 @@ CONFIG_DM_RAID45=m CONFIG_DRM_PSB=m # CONFIG_DVB_FE_CUSTOMISE is not set # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_EDAC_MM_EDAC=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_EVM=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index bdf22ae..44cd06b 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -49,6 +49,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # CONFIG_DRM_PSB is not set # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_EDAC_MM_EDAC=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_EVM=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 8a45460..a2c127f 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -55,6 +55,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # CONFIG_DRM_PSB is not set # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_EDAC_MM_EDAC=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_EVM=y