[parisc-linux-cvs] "Config.in" File in linux/drivers/char has a bug !

[Ryan Bradetich]

Attached patch from Christoph Plattner fixes a mis-merge
error.  Thanks Christoph!

- Ryan


Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.336
diff -u -p -r1.336 Makefile
--- Makefile	5 Aug 2002 20:01:09 -0000	1.336
+++ Makefile	11 Aug 2002 20:09:38 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 19
-EXTRAVERSION = -pa2
+EXTRAVERSION = -pa3
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/char/Config.in
===================================================================
RCS file: /var/cvs/linux/drivers/char/Config.in,v
retrieving revision 1.23
diff -u -p -r1.23 Config.in
--- drivers/char/Config.in	4 Aug 2002 22:58:10 -0000	1.23
+++ drivers/char/Config.in	11 Aug 2002 20:09:38 -0000
@@ -114,9 +114,10 @@ if [ "$CONFIG_FOOTBRIDGE" = "y" ]; then
          bool '        Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE
      fi
    fi
-   if [ "$CONFIG_PARISC" = "y" ]; then
-     bool '  PDC software console support' CONFIG_PDC_CONSOLE
-   fi
+fi
+if [ "$CONFIG_PARISC" = "y" ]; then
+   bool '  PDC software console support' CONFIG_PDC_CONSOLE
+fi
 fi
 if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
    bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD