[parisc-linux-cvs] linux deller

[Helge Deller]

--Boundary-00=_RpJK9fssuAMkKbc
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline

On Sunday 07 July 2002 21:45, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	02/07/07 13:45:34
>
> Modified files:
> 	drivers/hil    : Config.in
>
> Log message:
> some more tweaks.


--Boundary-00=_RpJK9fssuAMkKbc
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff"

Index: Config.in
===================================================================
RCS file: /var/cvs/linux/drivers/hil/Config.in,v
retrieving revision 1.3
diff -u -p -r1.3 Config.in
--- Config.in	2002/07/07 13:20:47	1.3
+++ Config.in	2002/07/07 19:45:00
@@ -5,38 +5,44 @@
 mainmenu_option next_comment
 comment 'HIL support'
 
-tristate 'HIL core support' CONFIG_HIL
-if [ "$CONFIG_HIL" != "n" ]; then
 
-  dep_tristate '  HIL Keyboard (basic) support' CONFIG_HIL_KBD_BASIC $CONFIG_INPUT_KEYBDEV $CONFIG_HIL
+if [ "$CONFIG_INPUT" = "n" ]; then
+   comment 'Input support needed for HIL support'
+else
+   bool 'HIL core support' CONFIG_HIL
 
-  if [ "$CONFIG_INPUT" = "n" -o "$CONFIG_INPUT_EVDEV" = "n" ]; then
-    comment 'Input support needed for full HIL support'
-  else
+   if [ "$CONFIG_HIL" != "n" ]; then
+    dep_tristate '  HIL Keyboard (basic) support' CONFIG_HIL_KBD_BASIC $CONFIG_INPUT_KEYBDEV
+
     comment ' HIL driver core support'
-    dep_tristate '  HP System Device Controller i8042 Support' CONFIG_HP_SDC $CONFIG_HIL
-    dep_tristate '  HP SDC Real Time Clock' CONFIG_HP_SDC_RTC $CONFIG_HP_SDC $CONFIG_HIL
-    # This is not accurate but for now it will save confusion.
-    dep_tristate '  HIL MLC Support' CONFIG_HIL_MLC $CONFIG_HP_SDC $CONFIG_HIL
-    define_tristate CONFIG_HP_SDC_MLC $CONFIG_HIL_MLC
+    tristate '  HP System Device Controller i8042 Support' CONFIG_HP_SDC
+    dep_tristate '  HP SDC Real Time Clock' CONFIG_HP_SDC_RTC $CONFIG_HP_SDC
+
+    dep_tristate '  HIL MLC Support' CONFIG_HIL_MLC $CONFIG_HP_SDC $CONFIG_INPUT_SERIO
+    if [ "$CONFIG_INPUT_SERIO" = "n"  ]; then
+      comment '  Serial IO support needed for HIL keyboard and mouse support'
+    else
+      # This is not accurate but for now it will save confusion.
+      define_tristate CONFIG_HP_SDC_MLC $CONFIG_HIL_MLC
+    fi
     
     comment ' HIL device driver'
   
     if [ "$CONFIG_HIL_MLC" != "n"  ]; then
-      if [ "$CONFIG_INPUT_KEYBDEV" = "n"  ]; then
-        comment '  Keyboard input support needed for HIL keyboard support'
+      if [ "$CONFIG_INPUT_KEYBDEV" = "n" ]; then
+        comment '  Keyboard input needed for HIL keyboard support'
       else
-        dep_tristate '  HIL Keyboard (full) support' CONFIG_HIL_KBD $CONFIG_INPUT_KEYBDEV $CONFIG_HIL_MLC $CONFIG_HIL
+        dep_tristate '  HIL Keyboard (full) support' CONFIG_HIL_KBD $CONFIG_INPUT_KEYBDEV $CONFIG_HIL_MLC
       fi
 
       if [ "$CONFIG_INPUT_MOUSEDEV" = "n" ]; then
         comment '  Mouse input support needed for HIL mouse/pointer support'
       else
-        dep_tristate '  HIL Mouse & Pointer support' CONFIG_HIL_PTR $CONFIG_INPUT_MOUSEDEV $CONFIG_HIL_MLC $CONFIG_HIL
+        dep_tristate '  HIL Mouse & Pointer support' CONFIG_HIL_PTR $CONFIG_INPUT_MOUSEDEV $CONFIG_HIL_MLC
       fi
     fi
 
-  fi
+   fi
 fi
 
 endmenu

--Boundary-00=_RpJK9fssuAMkKbc--