diff -urN hotplug_1.14/CONTROL/conffiles hotplug_1.17/CONTROL/conffiles
--- hotplug_1.14/CONTROL/conffiles	Wed Dec 31 19:00:00 1969
+++ hotplug_1.17/CONTROL/conffiles	Wed Apr 24 08:05:33 2002
@@ -0,0 +1 @@
+/etc/sysconfig/hotplug
diff -urN hotplug_1.14/CONTROL/control hotplug_1.17/CONTROL/control
--- hotplug_1.14/CONTROL/control	Sun Nov  4 21:54:24 2001
+++ hotplug_1.17/CONTROL/control	Wed Apr 24 08:05:33 2002
@@ -1,8 +1,8 @@
 Package: hotplug
 Priority: required
-Version:  1.14
+Version:  1.17
 Architecture: arm
 Maintainer: Jamey Hicks <jamey.hicks@compaq.com>
-Depends: 
+Depends:
 Description: Hotplug add/removal scripts for H3600
 Section: base
diff -urN hotplug_1.14/etc/hotplug/sleeve.agent hotplug_1.17/etc/hotplug/sleeve.agent
--- hotplug_1.14/etc/hotplug/sleeve.agent	Sun Nov  4 21:54:24 2001
+++ hotplug_1.17/etc/hotplug/sleeve.agent	Wed Apr 24 08:05:33 2002
@@ -17,34 +17,50 @@
     mesg "Executing $0 action=$ACTION, device=$DEVICE_NAME ($VENDOR_ID,$DEVICE_ID)"
 fi
 
+COMPACTFLASH_TIMING_INCREMENT=0
+PCMCIA_TIMING_INCREMENT=0
+DUAL_PCMCIA_TIMING_INCREMENT=0
+BACKPAQ_TIMING_INCREMENT=-100
+
+if [ -f /etc/sysconfig/hotplug ] ; then
+    . /etc/sysconfig/hotplug
+fi
+
 case $ACTION in
 add)
     case $DEVICE_NAME in 
     "Compaq Mercury Backpaq")
         mkdir -p /backpaq
+	echo $BACKPAQ_TIMING_INCREMENT > /proc/sys/backpaq/pcmcia/timing_increment_ns
         ## mount -t jffs2 /dev/mtdblock/4 /backpaq
         modprobe h3600_backpaq_fpga || mesg 'could not load backpaq fpga driver'
-	if [ -e /etc/fpga.bin ] ; then
-	    cat /etc/fpga.bin > /dev/backpaq/fpga
-	else
-	    mesg 'unable to program the backpaq fpga'
-	fi
         modprobe h3600_backpaq_camera || mesg 'could not load backpaq camera driver'
 	if [ -c /dev/v4l/video0 ] ; then
 	    ln -s /dev/v4l/video0 /dev/video0
 	    ln -s /dev/v4l/video0 /dev/video
 	fi
+	CAMERATYPE=`/bin/grep "CameraType" /proc/backpaq/camera | /bin/sed -e 's/.*: //'`
+	if [ -e /etc/fpga_$CAMERATYPE.bin ] ; then
+	    cat /etc/fpga_$CAMERATYPE.bin > /dev/backpaq/fpga
+	elif [ -e /etc/fpga.bin ] ; then
+	    cat /etc/fpga.bin > /dev/backpaq/fpga
+	else
+	    mesg 'unable to program the backpaq fpga'
+	fi
         modprobe h3600_backpaq_accel || mesg 'could not load backpaq accelerometer driver'
         mesg 'BackPAQ drivers loaded'
         ;;
     "Compaq CompactFlash Sleeve")
         mesg 'CompactFlash drivers loaded'
+        echo $COMPACTFLASH_TIMING_INCREMENT > /proc/sys/bus/pcmcia/timing_increment_ns
 	;;
     "Compaq PC Card Sleeve")
         mesg 'PC card sleeve drivers loaded'
+        echo $PCMCIA_TIMING_INCREMENT > /proc/sys/bus/pcmcia/timing_increment_ns
 	;;
     "Compaq Dual PC Card Sleeve")
         mesg 'Dual PC card sleeve drivers loaded'
+        echo $DUAL_PCMCIA_TIMING_INCREMENT > /proc/sys/bus/pcmcia/timing_increment_ns
 	;;
     *)
         mesg "$1 $ACTION event not handled for $DEVICE_NAME"
diff -urN hotplug_1.14/etc/resume-scripts/R35sleeve hotplug_1.17/etc/resume-scripts/R35sleeve
--- hotplug_1.14/etc/resume-scripts/R35sleeve	Sun Nov  4 21:54:24 2001
+++ hotplug_1.17/etc/resume-scripts/R35sleeve	Wed Apr 24 08:05:33 2002
@@ -5,25 +5,23 @@
 #
 SLEEVEFILE="/proc/bus/sleeve/device"
 
-    export DEVICE_NAME=`/bin/grep driver $SLEEVEFILE | /bin/sed -e 's/.*=//'`
-    case $DEVICE_NAME in
-    "Compaq Mercury Backpaq")
-        cat /etc/fpga.bin > /dev/backpaq/fpga
-        echo 'BackPAQ fpga loaded'
-        ;;
-    "Compaq CompactFlash Sleeve")
-        echo 'CompactFlash resuming'
-	;;
-    "Compaq PC Card Sleeve")
-        echo 'PC card sleeve resuming'
-	;;
-    "Compaq Dual PC Card Sleeve")
-        echo 'Dual PC card sleeve resuming'
-	;;
-    *)
-        echo $1 event not handled for $DEVICE_NAME
-	;;
-    esac
+export DEVICE_NAME=`/bin/grep driver $SLEEVEFILE | /bin/sed -e 's/.*=//'`
+case $DEVICE_NAME in
+"Compaq Mercury Backpaq")
+    cat /etc/fpga.bin > /dev/backpaq/fpga
+    echo 'BackPAQ fpga loaded'
+    ;;
+"Compaq CompactFlash Sleeve")
+    echo 'CompactFlash resuming'
+    ;;
+"Compaq PC Card Sleeve")
+    echo 'PC card sleeve resuming'
+    ;;
+"Compaq Dual PC Card Sleeve")
+    echo 'Dual PC card sleeve resuming'
+    ;;
+*)
+    echo $1 event not handled for $DEVICE_NAME
     ;;
 esac
 
diff -urN hotplug_1.14/etc/sysconfig/hotplug hotplug_1.17/etc/sysconfig/hotplug
--- hotplug_1.14/etc/sysconfig/hotplug	Wed Dec 31 19:00:00 1969
+++ hotplug_1.17/etc/sysconfig/hotplug	Wed Apr 24 08:05:33 2002
@@ -0,0 +1,9 @@
+##
+## Each of these may be assigned to the number of nanoseconds by which to
+## increase the timing of pcmcia bus transactions 
+##
+# COMPACTFLASH_TIMING_INCREMENT=0
+## the single pcmcia sleeve seems to be a bit slow, but 25ns makes my
+## orinoco card detectable. -Jamey 4/2/2002 
+PCMCIA_TIMING_INCREMENT=25
+# DUAL_PCMCIA_TIMING_INCREMENT=0