From 6ddcc5952856903f3e8f859a52ffe3d4821a6bb6 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Sun, 3 Aug 2003 23:04:07 +0000
Subject: [PATCH] powerpc drm agk tweaks rtc enabled fix for a comment typo

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@998 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 architecture/powerpc/kernel.conf.m4   | 11 +++++++++++
 architecture/share/kernel-common.conf |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/architecture/powerpc/kernel.conf.m4 b/architecture/powerpc/kernel.conf.m4
index 181ef7a29..0b7d92ecf 100644
--- a/architecture/powerpc/kernel.conf.m4
+++ b/architecture/powerpc/kernel.conf.m4
@@ -30,17 +30,26 @@ include(`kernel-net.conf')
 include(`kernel-fs.conf')
 
 dnl macs need an FB
+dnl
 CONFIG_FB_RIVA=y
 CONFIG_FB_MATROX=m
 CONFIG_FB_ATY=y
 CONFIG_FB_RADEON=y
 
+dnl AGP and DRM
+dnl
+CONFIG_AGP=y
+CONFIG_DRM_UNINORTH=m
+CONFIG_DRM=y
+
 dnl power management
+dnl
 CONFIG_PMAC_PBOOK=y
 CONFIG_PMAC_BACKLIGHT=y
 CONFIG_PMAC_APM_EMU=y
 
 # for 2.6 kernels
+dnl
 CONFIG_TAU=y
 
 CONFIG_CPU_FREQ=y
@@ -52,10 +61,12 @@ 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
 CONFIG_SUNGEM=y
 
diff --git a/architecture/share/kernel-common.conf b/architecture/share/kernel-common.conf
index 3bcbc0991..abb8caad5 100644
--- a/architecture/share/kernel-common.conf
+++ b/architecture/share/kernel-common.conf
@@ -96,7 +96,11 @@ dnl we use the seperate linux driver package from XFree86)
 dnl
 # CONFIG_DRM is not set
 
-dnl The 2.6 kernel has several debuggin options enabled
+dnl Other useful stuff
+dnl
+CONFIG_RTC=y
+
+dnl The 2.6 kernel has several debugging options enabled
 dnl
 # CONFIG_FRAME_POINTER is not set