[PATCH] : ir248_config-3.diff

[Jean Tourrilhes]

ir248_config-3.diff :
-------------------
	<Already in 2.5.1, for 2.4.18 only>
	o [FEATURE] Remove useless and confusing config option

diff -u -p linux/net/irda/Config.d3.in linux/net/irda/Config.in
--- linux/net/irda/Config.d3.in	Wed Nov 28 14:57:18 2001
+++ linux/net/irda/Config.in	Wed Nov 28 15:31:14 2001
@@ -14,13 +14,10 @@ if [ "$CONFIG_NET" != "n" ]; then
       source net/irda/irnet/Config.in
       source net/irda/ircomm/Config.in
       bool '  Ultra (connectionless) protocol' CONFIG_IRDA_ULTRA
-      bool '  IrDA protocol options' CONFIG_IRDA_OPTIONS
-      if [ "$CONFIG_IRDA_OPTIONS" != "n" ]; then
-	 comment '  IrDA options'
-	 bool '    Cache last LSAP' CONFIG_IRDA_CACHE_LAST_LSAP
-	 bool '    Fast RRs' CONFIG_IRDA_FAST_RR
-	 bool '    Debug information' CONFIG_IRDA_DEBUG
-      fi
+      comment 'IrDA options'
+      bool '  Cache last LSAP' CONFIG_IRDA_CACHE_LAST_LSAP
+      bool '  Fast RRs (low latency)' CONFIG_IRDA_FAST_RR
+      bool '  Debug information' CONFIG_IRDA_DEBUG
    fi
 
    if [ "$CONFIG_IRDA" != "n" ]; then
diff -u -p linux/arch/i386/defconfig.d3 linux/arch/i386/defconfig
--- linux/arch/i386/defconfig.d3	Tue Jan  8 17:09:27 2002
+++ linux/arch/i386/defconfig	Tue Jan  8 17:09:40 2002
@@ -496,6 +496,9 @@ CONFIG_PCMCIA_RAYCS=y
 # IrDA (infrared) support
 #
 # CONFIG_IRDA is not set
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
 
 #
 # ISDN subsystem