From patchwork Wed Jun 6 12:29:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [21/21] UBUNTU: [Config] Updateconfigs Date: Wed, 06 Jun 2012 02:29:57 -0000 From: Ike Panhc X-Patchwork-Id: 163356 Message-Id: <1338985797-26662-1-git-send-email-ike.pan@canonical.com> To: kernel-team@lists.ubuntu.com BugLink: http://launchpad.net/bugs/1008345 Several new configs are introduced for highbank CONFIG_HAVE_SCHED_CLOCK=y CONFIG_OF_CLOCK=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_EDAC_HIGHBANK_MC=y CONFIG_EDAC_HIGHBANK_L2=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=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 | 8 +++++++- 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, 13 insertions(+), 1 deletion(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 5326643..da0b882 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -169,6 +169,7 @@ CONFIG_DRM_PSB=m # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_ECHO=m CONFIG_ECONET=m +CONFIG_EDAC_MM_EDAC=m CONFIG_EFS_FS=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index da3df2a..a19015d 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -166,6 +166,7 @@ CONFIG_DVB_FE_CUSTOMISE=y CONFIG_DW_DMAC=m CONFIG_ECHO=m CONFIG_ECONET=m +CONFIG_EDAC_MM_EDAC=m CONFIG_EFS_FS=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index a323ca1..946f452 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -22,6 +22,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 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 b890c8c..35150ce 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -917,6 +917,9 @@ CONFIG_COMEDI_USBDUXFAST=m CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_USB_DRIVERS=m CONFIG_COMEDI_VMK80XX=m +CONFIG_COMMON_CLK=y +# CONFIG_COMMON_CLK_DEBUG is not set +# CONFIG_COMMON_CLK_DISABLE_UNUSED is not set CONFIG_COMPAL_LAPTOP=m CONFIG_COMPAT=y CONFIG_COMPAT_BINFMT_ELF=y @@ -1374,6 +1377,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 @@ -1385,7 +1390,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 @@ -1716,6 +1720,7 @@ CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_HAVE_BPF_JIT=y CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_ATTRS=y @@ -3273,6 +3278,7 @@ CONFIG_OCFS2_FS_STATS=y CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OF=y CONFIG_OF_ADDRESS=y +CONFIG_OF_CLOCK=y CONFIG_OF_DEVICE=y CONFIG_OF_DYNAMIC=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 068df1f..8a54c29 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -170,6 +170,7 @@ CONFIG_DRM_PSB=m # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_ECHO=m CONFIG_ECONET=m +CONFIG_EDAC_MM_EDAC=m CONFIG_EFS_FS=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index d7bd371..77daf26 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -163,6 +163,7 @@ CONFIG_DRM=m CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y CONFIG_ECHO=m CONFIG_ECONET=m +CONFIG_EDAC_MM_EDAC=m CONFIG_EFS_FS=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index a5c075b..44b1719 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -169,6 +169,7 @@ CONFIG_DRM=m CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y CONFIG_ECHO=m CONFIG_ECONET=m +CONFIG_EDAC_MM_EDAC=m CONFIG_EFS_FS=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set