shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'alioth/master'

Browse Source
This commit is contained in:
Ben Hutchings
2016-05-09 01:42:11 +01:00
parent b92b4d15f0 8b32b01e4a
commit fef70457e0
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@@ -9,6 +9,10 @@ linux (4.6~rc7-1~exp1) UNRELEASED; urgency=medium
* [hppa] Enable MLONGCALLS (fixes FTBFS)
* [alpha] fs: Disable BINFMT_EM86 (obsoleted by binfmt_misc; fixes FTBFS)
[ Aurelien Jarno ]
* [mips*/octeon] Enable EDAC, EDAC_MM_EDAC, EDAC_OCTEON_L2C,
EDAC_OCTEON_LMC, EDAC_OCTEON_PC, EDAC_OCTEON_PCI.
-- Ben Hutchings <ben@decadent.org.uk> Thu, 05 May 2016 10:54:38 +0100
linux (4.6~rc5-1~exp1) experimental; urgency=medium

10
debian/config/kernelarch-mips/config.octeon vendored
View File

@@ -50,6 +50,16 @@ CONFIG_PATA_OCTEON_CF=y
##
CONFIG_HW_RANDOM_OCTEON=m
##
## file: drivers/edac/Kconfig
##
CONFIG_EDAC=y
CONFIG_EDAC_MM_EDAC=m
CONFIG_EDAC_OCTEON_L2C=m
CONFIG_EDAC_OCTEON_LMC=m
CONFIG_EDAC_OCTEON_PC=m
CONFIG_EDAC_OCTEON_PCI=m
##
## file: drivers/i2c/Kconfig
##