Update m68k config (Closes: #728392)

svn path=/dists/trunk/linux/; revision=20798
This commit is contained in:
Ben Hutchings 2013-11-21 01:14:34 +00:00
parent 4e947b4113
commit 45461d5355
2 changed files with 9 additions and 2 deletions

6
debian/changelog vendored
View File

@ -11,6 +11,12 @@ linux (3.12-1~exp1) UNRELEASED; urgency=low
* [armel/{iop32x,ixp4xx}] Disable BPF_JIT, MEMCG, USER_NS to reduce kernel
size
[ Thorsten Glaser ]
* Update m68k config (Closes: #728392):
- enable COMPAT_BRK by explicit upstream (m68k maintainer) request
- re-enable FPU emulation after discussion upstream, by popular request
- disable ADB_MACIISI by upstream (Mac68k maintainer) request
-- Ben Hutchings <ben@decadent.org.uk> Fri, 01 Nov 2013 23:36:11 +0000
linux (3.12~rc7-1~exp1) experimental; urgency=low

View File

@ -17,7 +17,7 @@ CONFIG_M68020=y
CONFIG_M68030=y
CONFIG_M68040=y
CONFIG_M68060=y
# CONFIG_M68KFPU_EMU is not set
CONFIG_M68KFPU_EMU=y
# CONFIG_ADVANCED is not set
##
@ -305,7 +305,7 @@ CONFIG_SERIO_LIBPS2=y
##
CONFIG_ADB=y
CONFIG_ADB_MACII=y
CONFIG_ADB_MACIISI=y
# CONFIG_ADB_MACIISI is not set
CONFIG_ADB_IOP=y # switched on for the benefit of IIfx, Q900, Q950
CONFIG_ADB_PMU68K=y
CONFIG_ADB_CUDA=y
@ -731,6 +731,7 @@ CONFIG_LOG_BUF_SHIFT=16
# CONFIG_CGROUPS is not set
# CONFIG_SCHED_AUTOGROUP is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_COMPAT_BRK=y
# CONFIG_MODULE_SIG is not set
##