[parisc-linux-cvs] moving HIL drivers to drivers/hil/*

[Helge Deller]

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

On Tuesday 25 June 2002 21:53, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	02/06/25 13:53:07
>
> Modified files:
> 	drivers        : Makefile
> 	drivers/char   : Config.in Makefile
> 	drivers/gsc    : wax.c
> Added files:
> 	drivers/hil    : Config.in Makefile hil_kbd.c hil_mlc.c
> 	                 hil_ptr.c hilkbd.c hp_sdc.c hp_sdc_mlc.c
> 	                 hp_sdc_rtc.c
> Removed files:
> 	drivers/char   : hil_kbd.c hil_mlc.c hil_ptr.c hilkbd.c hp_sdc.c
> 	                 hp_sdc_mlc.c hp_sdc_rtc.c
>
> Log message:
> - moving the HIL drivers from drivers/char/ to drivers/hil
> - adjusting the Config.in's and Makefile's

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

Index: Makefile
===================================================================
RCS file: /var/cvs/linux/drivers/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile	2002/02/26 00:44:52	1.13
+++ Makefile	2002/06/25 19:47:12
@@ -6,7 +6,7 @@
 #
 
 
-mod-subdirs :=	dio mtd sbus video macintosh usb input telephony sgi ide \
+mod-subdirs :=	dio hil mtd sbus video macintosh usb input telephony sgi ide \
 		message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
 		fc4 net/hamradio i2c acpi bluetooth
 
@@ -17,6 +17,7 @@ subdir-m :=	$(subdir-y)
 subdir-$(CONFIG_DIO)		+= dio
 subdir-$(CONFIG_PCI)		+= pci
 subdir-$(CONFIG_GSC)		+= gsc
+subdir-$(CONFIG_HIL)		+= hil
 subdir-$(CONFIG_PCMCIA)		+= pcmcia
 subdir-$(CONFIG_MTD)		+= mtd
 subdir-$(CONFIG_SBUS)		+= sbus
Index: char/Config.in
===================================================================
RCS file: /var/cvs/linux/drivers/char/Config.in,v
retrieving revision 1.21
diff -u -p -r1.21 Config.in
--- char/Config.in	2002/05/03 18:56:47	1.21
+++ char/Config.in	2002/06/25 19:47:12
@@ -10,22 +10,6 @@ if [ "$CONFIG_VT" = "y" ]; then
    if [ "$CONFIG_GSC_LASI" = "y" ]; then
       bool '    Support for Lasi/Dino PS2 port' CONFIG_GSC_PS2
    fi
-   if [ "$CONFIG_GSC_WAX" = "y" ]; then
-      if [ "$CONFIG_HP_SDC" != "y" -a "$CONFIG_HP_SDC" != "m" ]; then
-         bool '    HIL keyboard support' CONFIG_HIL n
-      fi
-      if [ "$CONFIG_HIL" != "y" ]; then
-         tristate 'HP System Device Controller i8042 Support' CONFIG_HP_SDC n
-	 dep_tristate 'HP SDC Real Time Clock' CONFIG_HP_SDC_RTC $CONFIG_HP_SDC
-	 # This is not accurate but for now it will save confusion.
-         if [ "$CONFIG_INPUT" != "n" ]; then
-	   dep_tristate 'HIL MLC Support' CONFIG_HIL_MLC $CONFIG_HP_SDC
-	   define_tristate CONFIG_HP_SDC_MLC $CONFIG_HIL_MLC
-	   dep_tristate 'HIL Keyboard Support' CONFIG_HIL_KBD $CONFIG_HIL_MLC
-	   dep_tristate 'HIL Pointer Support' CONFIG_HIL_PTR $CONFIG_HIL_MLC
-	 fi
-      fi
-   fi
 fi
 tristate 'Standard/generic (8250/16550 and compatible UARTs) serial support' CONFIG_SERIAL
 if [ "$CONFIG_SERIAL" = "y" ]; then
Index: char/Makefile
===================================================================
RCS file: /var/cvs/linux/drivers/char/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- char/Makefile	2002/05/03 18:56:47	1.29
+++ char/Makefile	2002/06/25 19:47:12
@@ -21,7 +21,7 @@ obj-y	 += mem.o tty_io.o n_tty.o tty_ioc
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
-export-objs     :=	busmouse.o console.o hp_sdc.o hil_mlc.o \
+export-objs     :=	busmouse.o console.o \
 			keyboard.o sysrq.o misc.o pty.o random.o selection.o \
                         serial.o sonypi.o tty_io.o tty_ioctl.o generic_serial.o
 
@@ -148,12 +148,7 @@ else
   obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
 endif
 
-obj-$(CONFIG_HIL) += hilkbd.o hp_keyb.o
-obj-$(CONFIG_HP_SDC) += hp_sdc.o
-obj-$(CONFIG_HIL_MLC) += hil_mlc.o
-obj-$(CONFIG_HP_SDC_MLC) += hp_sdc_mlc.o
-obj-$(CONFIG_HIL_KBD) += hil_kbd.o
-obj-$(CONFIG_HIL_PTR) += hil_ptr.o
+obj-$(CONFIG_HIL) += hp_keyb.o
 obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
 obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
 obj-$(CONFIG_ROCKETPORT) += rocket.o

--Boundary-00=_JrMG9e9ClaGP4dU--