From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Fri, 23 Nov 2001 02:57:06 +0000 (+0000)
Subject: okay, _really_ fixed problem with comedi_rt_timer getting compiled on non-RT kernels
X-Git-Tag: r0_7_62~92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ddb2393df4117aae44495b0098bc65be559ab460;p=comedi.git

okay, _really_ fixed problem with comedi_rt_timer getting compiled on non-RT kernels
when make config used defaults in config.dist
---

diff --git a/comedi/Config.in b/comedi/Config.in
index 8697d53c..524cfb8e 100644
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -2,27 +2,27 @@
 comment 'Comedi Features'
 
 if [ "$CONFIG_RTL" = "y" ];then
-	bool 'Real-time support' CONFIG_COMEDI_RT
-	if [ "$CONFIG_COMEDI_RT" = "y" ];then
-		define_bool CONFIG_COMEDI_RTL y
+	bool 'Real-time support' CONFIG_COMEDI_RTL
+	if [ "$CONFIG_COMEDI_RTL" = "y" ];then
+		define_bool CONFIG_COMEDI_RT y
 	fi
 fi
 if [ "$CONFIG_RTL_V1" = "y" ];then
-	bool 'Real-time v1 support' CONFIG_COMEDI_RT
-	if [ "$CONFIG_COMEDI_RT" = "y" ];then
-		define_bool CONFIG_COMEDI_RTL_V1 y
+	bool 'Real-time v1 support' CONFIG_COMEDI_RTL_V1
+	if [ "$CONFIG_COMEDI_RTL_V1" = "y" ];then
+		define_bool CONFIG_COMEDI_RT y
 	fi
 fi
 if [ "$CONFIG_RTHAL" = "y" ];then
-	bool 'Real-time support' CONFIG_COMEDI_RT
-	if [ "$CONFIG_COMEDI_RT" = "y" ];then
-		define_bool CONFIG_COMEDI_RTAI y
+	bool 'Real-time support' CONFIG_COMEDI_RTAI
+	if [ "$CONFIG_COMEDI_RTAI" = "y" ];then
+		define_bool CONFIG_COMEDI_RT y
 	fi
 fi
 if [ "$CONFIG_PRIORITY_IRQ" = "y" ];then
-	bool 'Real-time support' CONFIG_COMEDI_RT
-	if [ "$CONFIG_COMEDI_RT" = "y" ];then
-		define_bool CONFIG_COMEDI_PIRQ y
+	bool 'Real-time support' CONFIG_COMEDI_PIRQ
+	if [ "$CONFIG_COMEDI_PIRQ" = "y" ];then
+		define_bool CONFIG_COMEDI_RT y
 	fi
 fi
 
@@ -112,6 +112,5 @@ dep_tristate 'Skeleton driver' CONFIG_COMEDI_SKEL $CONFIG_COMEDI
 
 if [ "$CONFIG_COMEDI_RT" = "y" ];then
 	dep_tristate 'Real-time command emulator (timer)' CONFIG_COMEDI_RT_TIMER $CONFIG_COMEDI
-	else define_bool CONFIG_COMEDI_RT_TIMER n
 fi
 
diff --git a/scripts/config.dist b/scripts/config.dist
index a0385c2c..7448669d 100644
--- a/scripts/config.dist
+++ b/scripts/config.dist
@@ -6,8 +6,8 @@ CONFIG_COMEDI=m
 #
 # Comedi Features
 #
-# CONFIG_COMEDI_TRIG is not set
-CONFIG_COMEDI_RT=y
+CONFIG_COMEDI_RTL=y
+CONFIG_COMEDI_RTL_V1=y
 CONFIG_COMEDI_RTAI=y
 CONFIG_COMEDI_DEBUG=y
 CONFIG_COMEDI_KLIB=m