From 35f7d19e417e13ac49b8d4e75a6d61b4cb31d959 Mon Sep 17 00:00:00 2001 From: fake Date: Fri, 25 Nov 2005 17:20:50 +0000 Subject: [PATCH] fake: arch/powerpc: fix kernel config, re-disable SMP after it's enabled by the kernel-general include, do not build OSS dma sound module (alsa one works). [2005102919542608592] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6637 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- architecture/powerpc/kernel.conf.m4 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/architecture/powerpc/kernel.conf.m4 b/architecture/powerpc/kernel.conf.m4 index afb526697..7a0fd341a 100644 --- a/architecture/powerpc/kernel.conf.m4 +++ b/architecture/powerpc/kernel.conf.m4 @@ -15,7 +15,6 @@ CONFIG_PMAC=y # CONFIG_GEMINI is not set # CONFIG_APUS is not set # CONFIG_SMP is not set -# CONFIG_ALTIVEC is not set CONFIG_MACH_SPECIFIC=y # additional 2.6 kernel configs @@ -30,6 +29,9 @@ include(`kernel-scsi.conf') include(`kernel-net.conf') include(`kernel-fs.conf') +CONFIG_BROKEN_ON_SMP=y +# CONFIG_SMP is not set + CONFIG_HFS_FS=y dnl macs need a special RTC ... (this need to be fixed in the kernel so we @@ -75,11 +77,6 @@ CONFIG_MAC_FLOPPY=y CONFIG_PMU_HD_BLINK=y # CONFIG_MAC_ADBKEYCODES is not set -dnl make sure old OSS modules are build (ALSA does not yet work correct) -dnl -CONFIG_DMASOUND_PMAC=m -CONFIG_DMASOUND=m - dnl some network teaks (the GMAC is obsoleted by SUNGEM) dnl # CONFIG_GMAC is not set