summaryrefslogtreecommitdiff
path: root/hotplug
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /hotplug
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'hotplug')
-rw-r--r--hotplug/files/collie/usbd1
-rw-r--r--hotplug/files/mmc.agent44
-rw-r--r--hotplug/files/sleeve.agent120
-rw-r--r--hotplug/files/sleeve.rc60
-rw-r--r--hotplug/files/sysconfig-hotplug12
-rw-r--r--hotplug/files/sysconfig-usb0
-rw-r--r--hotplug/files/tosa/sysconfig-usb2
-rw-r--r--hotplug/files/usbd2
-rw-r--r--hotplug/files/usbd.agent63
-rw-r--r--hotplug/hotplug-20040329/busybox.patch13
-rw-r--r--hotplug/hotplug-20040329/fix-net.agent29
-rw-r--r--hotplug/hotplug-20040329/logcheck-ignore1
-rw-r--r--hotplug/hotplug-20040329/update-usb.usermap37
-rw-r--r--hotplug/hotplug-20040920/fix-net.agent29
-rw-r--r--hotplug/hotplug-20040920/logcheck-ignore1
-rw-r--r--hotplug/hotplug-20040920/update-usb.usermap37
-rw-r--r--hotplug/hotplug-20040920/userspecified_hcd.patch55
-rw-r--r--hotplug/hotplug_20040329.bb0
-rw-r--r--hotplug/hotplug_20040920.bb0
19 files changed, 0 insertions, 506 deletions
diff --git a/hotplug/files/collie/usbd b/hotplug/files/collie/usbd
deleted file mode 100644
index 38aff0adcb..0000000000
--- a/hotplug/files/collie/usbd
+++ /dev/null
@@ -1 +0,0 @@
-usbdmodule="sa1100_bi"
diff --git a/hotplug/files/mmc.agent b/hotplug/files/mmc.agent
deleted file mode 100644
index 20af4c69ad..0000000000
--- a/hotplug/files/mmc.agent
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# H3600 Sleeve hotplug policy agent for Linux 2.4 kernels
-#
-# Kernel NET hotplug params include:
-#
-# ACTION=%s [add or remove]
-# MEDIA=%s
-# SLOT=%d
-#
-
-. /etc/hotplug/hotplug.functions
-#DEBUG=yes export DEBUG
-
- echo "Executing $0 action=$ACTION, media=$MEDIA ($SLOT)" > /dev/console
-
-MMC_MOUNT_OPTIONS="-t auto -o sync,noatime"
-
-if [ -f /etc/sysconfig/hotplug ] ; then
- . /etc/sysconfig/hotplug
-fi
-
-if [ "$ACTION" = "add" ] ; then
- echo -n add > /dev/console
- if [ "$MEDIA" = "flash" ] ; then
- for n in 1 2 3 4 ; do
- device=/dev/mmc/part$n
- if [ "$n" = "1" ] ; then
- card=/mnt/card
- else
- card=/mnt/card$n
- fi
- [ -b $device ] || break
- echo flash on $device > /dev/console
- [ -d $card ] || mkdir -p $card
- mount $MMC_MOUNT_OPTIONS $device $card
- done
- fi
-
-else
- for card in /mnt/card*; do
- umount $card
- done
-fi
diff --git a/hotplug/files/sleeve.agent b/hotplug/files/sleeve.agent
deleted file mode 100644
index 55befca1b1..0000000000
--- a/hotplug/files/sleeve.agent
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-#
-# H3600 Sleeve hotplug policy agent for Linux 2.4 kernels
-#
-# Kernel NET hotplug params include:
-#
-# ACTION=%s [add or remove]
-# VENDOR_ID=%s
-# DEVICE_ID=%x
-# DEVICE_NAME=%s
-#
-
-. /etc/hotplug/hotplug.functions
-#DEBUG=yes export DEBUG
-
-if [ "$DEBUG" != "" ]; then
- 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
-NAVMAN_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'
- 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/.*: //'`
- BACKPAQ_NUMBER=`/bin/grep "Major revision" /proc/backpaq/eeprom | /bin/sed -e 's/.*0x//'`
- FPGA_NUMBER=`/bin/grep "FPGA version" /proc/backpaq/eeprom | /bin/sed -e 's/.*0x//'`
- CAMERA_NUMBER=`/bin/grep "Camera" /proc/backpaq/eeprom | /bin/sed -e 's/.*0x//'`
-
- echo "CAMERA_TYPE = $CAMERATYPE"
- echo "BACKPAQ_NUMBER = $BACKPAQ_NUMBER"
- echo "FPGA_NUMBER = $FPGA_NUMBER"
- echo "CAMERA_NUMBER = $CAMERA_NUMBER"
- echo "looking for file: /etc/fpga_B${BACKPAQ_NUMBER}_F${FPGA_NUMBER}_C${CAMERA_NUMBER}.bin"
- if [ -e /etc/fpga_B${BACKPAQ_NUMBER}_F${FPGA_NUMBER}_C${CAMERA_NUMBER}.bin ] ; then
- cat /etc/fpga_B${BACKPAQ_NUMBER}_F${FPGA_NUMBER}_C${CAMERA_NUMBER}.bin > /dev/backpaq/fpga
- elif [ -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
- ;;
- "Navman GPS/CF Sleeve")
- mesg 'Navman GPS sleeve drivers loaded'
- echo $NAVMAN_TIMING_INCREMENT > /proc/sys/bus/pcmcia/timing_increment_ns
- start-stop-daemon --start --exec /usr/sbin/gpsd.bin -- -p /dev/tts/0 -s 57600
- ;;
- *)
- mesg "$1 $ACTION event not handled for $DEVICE_NAME"
- ;;
- esac
- ;;
-
-remove)
- case $DEVICE_NAME in
- "Compaq Mercury Backpaq")
- mesg 'Unloading BackPAQ drivers'
- ## umount /backpaq
- rmmod h3600_backpaq_camera
- rmmod h3600_backpaq_accel
- rmmod h3600_backpaq_fpga
- ;;
- "Compaq CompactFlash Sleeve")
- mesg 'Unloading CompactFlash sleeve'
- ;;
- "Compaq PC Card Sleeve")
- mesg 'Unloading PC Card sleeve'
- ;;
- "Compaq Dual PC Card Sleeve")
- mesg 'Unloading Dual PC Card sleeve'
- ;;
- "Navman GPS/CF Sleeve")
- mesg 'Unloading Navman GPS sleeve'
- start-stop-daemon --stop --name gpsd.bin
- ;;
- *)
- mesg $1 $ACTION event not handled for $DEVICE_NAME
- ;;
- esac
- ;;
-
-*)
- mesg "$1 $ACTION event not supported"
- exit 1 ;;
-
-esac
diff --git a/hotplug/files/sleeve.rc b/hotplug/files/sleeve.rc
deleted file mode 100644
index 864a2eb182..0000000000
--- a/hotplug/files/sleeve.rc
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# H3600 Sleeve hotplug *.rc agent.
-# This script is called by /etc/init.d/hotplug whenever
-# a run level has changed.
-#
-# A single argument is passed - start, restart, status, or stop
-#
-# We set up parameters that are equivalent to the ones created
-# by the Kernel and pass them along to /sbin/hotplug (the
-# function called by the kernel).
-#
-# Kernel NET hotplug params include:
-#
-# ACTION=%s [add or remove]
-# VENDOR_ID=%s
-# DEVICE_ID=%x
-# DEVICE_NAME=%s
-#
-
-. /etc/hotplug/hotplug.functions
-# DEBUG=yes export DEBUG
-
-SLEEVEFILE="/proc/bus/sleeve/device"
-[ ! -f $SLEEVEFILE ] && exit 0
-
-# give the sleeve driver a kick to make sure it recognizes the card -Jamey 6/26/01
-# echo > /proc/sys/sleeve/insert
-
-export DEVICE_NAME=`/bin/grep driver $SLEEVEFILE | /bin/sed -e 's/.*=//'`
-export DEVICE_ID=`/bin/grep device $SLEEVEFILE | /bin/sed -e 's/.*=//'`
-export VENDOR_ID=`/bin/grep vendor $SLEEVEFILE | /bin/sed -e 's/.*=//'`
-
-case "$1" in
- start)
- export ACTION="add"
- /sbin/hotplug sleeve
- ;;
- stop)
- export ACTION="remove"
- /sbin/hotplug sleeve
- ;;
- restart)
- export ACTION="remove"
- /sbin/hotplug sleeve
- export ACTION="add"
- /sbin/hotplug sleeve
- ;;
- status)
- if [ -f /var/lock/subsys/hotplug ]; then
- mesg "Hot plug sleeve has been started, current device $DEVICE_NAME"
- else
- mesg "Hot plug sleeve has not been started, current device $DEVICE_NAME"
- fi
- ;;
- *)
- mesg "Usage: $0 {start|stop|status|restart}"
- ;;
-esac
-
diff --git a/hotplug/files/sysconfig-hotplug b/hotplug/files/sysconfig-hotplug
deleted file mode 100644
index 7ee5a20c31..0000000000
--- a/hotplug/files/sysconfig-hotplug
+++ /dev/null
@@ -1,12 +0,0 @@
-##
-## 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
-
-## mount options used by MMC
-MMC_MOUNT_OPTIONS="-t auto -o sync,noatime"
diff --git a/hotplug/files/sysconfig-usb b/hotplug/files/sysconfig-usb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/hotplug/files/sysconfig-usb
+++ /dev/null
diff --git a/hotplug/files/tosa/sysconfig-usb b/hotplug/files/tosa/sysconfig-usb
deleted file mode 100644
index cbd18c6566..0000000000
--- a/hotplug/files/tosa/sysconfig-usb
+++ /dev/null
@@ -1,2 +0,0 @@
-## Specify the USB host controller driver
-HCD="usb_ohci_tc6393"
diff --git a/hotplug/files/usbd b/hotplug/files/usbd
deleted file mode 100644
index aa4e6d2de7..0000000000
--- a/hotplug/files/usbd
+++ /dev/null
@@ -1,2 +0,0 @@
-usbdmodule=""
-
diff --git a/hotplug/files/usbd.agent b/hotplug/files/usbd.agent
deleted file mode 100644
index 6613b4810a..0000000000
--- a/hotplug/files/usbd.agent
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/ash
-
-# DEBUG=yes export DEBUG
-#set -x
-
-. /etc/hotplug/hotplug.functions
-. /etc/default/usbd
-cd $HOTPLUG_DIR
-
-[ -z "$INTERFACE" ] && exit 1
-[ -z "$ACTION" ] && exit 1
-[ -z "$usbdmodule" ] && exit 0
-
-debug_mesg "USBD $ACTION Action Recived"
-
-case $INTERFACE in
-
-monitor)
- case $ACTION in
- # called to load all usb device modules
- load)
- modprobe usbdcore
- modprobe net_fd
- modprobe $usbdmodule
- ;;
-
- # called to handle suspend power management event
- suspend)
- rmmod $usbdmodule
- ;;
-
- # called to reload after resume power management event
- restore-loaded)
- modprobe $usbdmodule
- sleep 2
- ;;
-
- # called to unload after resume power management event
- restore-unloaded)
- modprobe -r net_fd
- ;;
-
- # called to unload all usb device modules
- unload)
- modprobe -r $usbdmodule
- ;;
-
- *)
- debug_mesg USBD $ACTION event not handled
- exit 1
- ;;
- esac
- ;;
-*)
- debug_mesg USBD $INTERFACE-$ACTION event not handled
- exit 1
- ;;
-esac
-
-[ -e /proc/usb-monitor ] && echo "Done" > /proc/usb-monitor
-
-exit 0
-
diff --git a/hotplug/hotplug-20040329/busybox.patch b/hotplug/hotplug-20040329/busybox.patch
deleted file mode 100644
index 7a90f246a5..0000000000
--- a/hotplug/hotplug-20040329/busybox.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- hotplug-2004_03_29/etc/hotplug.d/default/default.hotplug~busybox 2004-03-26 23:34:34.000000000 +0100
-+++ hotplug-2004_03_29/etc/hotplug.d/default/default.hotplug 2004-06-18 23:33:22.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # This version of /sbin/hotplug should works on most GNU/Linux systems
- # using Linux 2.2.18+ or 2.4.* kernels. On 2.2.*, only USB has such
diff --git a/hotplug/hotplug-20040329/fix-net.agent b/hotplug/hotplug-20040329/fix-net.agent
deleted file mode 100644
index 3bc0935018..0000000000
--- a/hotplug/hotplug-20040329/fix-net.agent
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-#
-# Since ifupdown of Debian is different than one of RedHat.
-# So we need to fix it
-
-topdir=$1
-dir=$topdir/etc/hotplug
-test -f $dir/net.agent || exit 1
-mv $dir/net.agent $dir/net.agent.orig
-
-sed -e '/^\*)/i\
-unregister)\
- # Assume that we want to run ifdown no matter what, \
- # because it is not going to remove the data from the \
- # ifstate database otherwise.\
- if [ -x /sbin/ifdown ]; then\
- debug_mesg invoke ifdown $INTERFACE\
- exec /sbin/ifdown $INTERFACE\
- else\
- # mesg "how do I bring interfaces up on this distro?"\
- mesg "E: /sbin/ifdown not found. You need to install ifupdown package"\
- fi\
- mesg $1 $ACTION event not handled\
- ;;\
-' $dir/net.agent.orig > $dir/net.agent
-rm -f $dir/net.agent.orig
-chmod 755 $dir/net.agent
-exit 0
-
diff --git a/hotplug/hotplug-20040329/logcheck-ignore b/hotplug/hotplug-20040329/logcheck-ignore
deleted file mode 100644
index b941353041..0000000000
--- a/hotplug/hotplug-20040329/logcheck-ignore
+++ /dev/null
@@ -1 +0,0 @@
-net.agent: invoke if(up|down)
diff --git a/hotplug/hotplug-20040329/update-usb.usermap b/hotplug/hotplug-20040329/update-usb.usermap
deleted file mode 100644
index d09e1176ec..0000000000
--- a/hotplug/hotplug-20040329/update-usb.usermap
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-# update-usb.usermap
-# Copyright (c) 2001 Fumitoshi UKAI <ukai@debian.or.jp>
-# GPL
-
-LIBDIR=/usr/lib/hotplug
-USERMAP=/etc/hotplug/usb.usermap
-LOCALMAP=/etc/hotplug/usb.usermap.local
-
-test -d $LIBDIR || exit 0
-
-echo -n "Updating $USERMAP ..."
-
-echo "# usb.usermap file" > $USERMAP
-echo "# This is autogenerated by update-usb.usermap program" >> $USERMAP
-echo "# usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info" >> $USERMAP
-
-if [ -f $LOCALMAP ]; then
- echo "# usb.usermap.local" >> $USERMAP
- cat $LOCALMAP >> $USERMAP
-fi
-
-cd $LIBDIR
-for package in *
-do
- if [ -d "$package" ]; then
- map=$package/usb.usermap
- echo "# $package" >> $USERMAP
- if [ -x "$map" ]; then
- ./$map >> $USERMAP
- elif [ -f "$map" ]; then
- cat $map >> $USERMAP
- fi
- fi
-done
-
-echo done.
diff --git a/hotplug/hotplug-20040920/fix-net.agent b/hotplug/hotplug-20040920/fix-net.agent
deleted file mode 100644
index 3bc0935018..0000000000
--- a/hotplug/hotplug-20040920/fix-net.agent
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-#
-# Since ifupdown of Debian is different than one of RedHat.
-# So we need to fix it
-
-topdir=$1
-dir=$topdir/etc/hotplug
-test -f $dir/net.agent || exit 1
-mv $dir/net.agent $dir/net.agent.orig
-
-sed -e '/^\*)/i\
-unregister)\
- # Assume that we want to run ifdown no matter what, \
- # because it is not going to remove the data from the \
- # ifstate database otherwise.\
- if [ -x /sbin/ifdown ]; then\
- debug_mesg invoke ifdown $INTERFACE\
- exec /sbin/ifdown $INTERFACE\
- else\
- # mesg "how do I bring interfaces up on this distro?"\
- mesg "E: /sbin/ifdown not found. You need to install ifupdown package"\
- fi\
- mesg $1 $ACTION event not handled\
- ;;\
-' $dir/net.agent.orig > $dir/net.agent
-rm -f $dir/net.agent.orig
-chmod 755 $dir/net.agent
-exit 0
-
diff --git a/hotplug/hotplug-20040920/logcheck-ignore b/hotplug/hotplug-20040920/logcheck-ignore
deleted file mode 100644
index b941353041..0000000000
--- a/hotplug/hotplug-20040920/logcheck-ignore
+++ /dev/null
@@ -1 +0,0 @@
-net.agent: invoke if(up|down)
diff --git a/hotplug/hotplug-20040920/update-usb.usermap b/hotplug/hotplug-20040920/update-usb.usermap
deleted file mode 100644
index d09e1176ec..0000000000
--- a/hotplug/hotplug-20040920/update-usb.usermap
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-# update-usb.usermap
-# Copyright (c) 2001 Fumitoshi UKAI <ukai@debian.or.jp>
-# GPL
-
-LIBDIR=/usr/lib/hotplug
-USERMAP=/etc/hotplug/usb.usermap
-LOCALMAP=/etc/hotplug/usb.usermap.local
-
-test -d $LIBDIR || exit 0
-
-echo -n "Updating $USERMAP ..."
-
-echo "# usb.usermap file" > $USERMAP
-echo "# This is autogenerated by update-usb.usermap program" >> $USERMAP
-echo "# usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info" >> $USERMAP
-
-if [ -f $LOCALMAP ]; then
- echo "# usb.usermap.local" >> $USERMAP
- cat $LOCALMAP >> $USERMAP
-fi
-
-cd $LIBDIR
-for package in *
-do
- if [ -d "$package" ]; then
- map=$package/usb.usermap
- echo "# $package" >> $USERMAP
- if [ -x "$map" ]; then
- ./$map >> $USERMAP
- elif [ -f "$map" ]; then
- cat $map >> $USERMAP
- fi
- fi
-done
-
-echo done.
diff --git a/hotplug/hotplug-20040920/userspecified_hcd.patch b/hotplug/hotplug-20040920/userspecified_hcd.patch
deleted file mode 100644
index c2ceeb686e..0000000000
--- a/hotplug/hotplug-20040920/userspecified_hcd.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- hotplug-2004_09_20/etc/hotplug/usb.rc~userspecified_hcd.patch
-+++ hotplug-2004_09_20/etc/hotplug/usb.rc
-@@ -24,6 +24,7 @@
- unset I_WANT_A_BROKEN_PS
- PS_PERSONALITY=linux
-
-+HCD=
- STATIC_MODULE_LIST=
- X11_USBMICE_HACK=false
-
-@@ -166,20 +167,25 @@
- # FIXME: some of this should be driven by PCI hotplugging, and have
- # the blacklist control which uhci driver gets used (before 2.5).
-
-- # "new style" HCDs ... more common code
-- modprobe -q ehci-hcd >/dev/null 2>&1
-- modprobe -q ohci-hcd >/dev/null 2>&1
-- modprobe -q uhci-hcd >/dev/null 2>&1
--
-- # "old style" HCDs ... more driver-specific bugs
-- modprobe -q usb-ohci >/dev/null 2>&1
-- # NOTE: this prefers "uhci"; you may prefer "usb-uhci".
-- # modprobe -q usb-uhci >/dev/null 2>&1 || modprobe -q uhci >/dev/null 2>&1
-- modprobe -q uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1
--
-- # ... add any non-PCI HCDS here. Examples include the
-- # CRIS usb-host, Philips ISP-1161, Symlogic 811HS, and so on.
-- # ohci-hcd can handle some non-pci variants.
-+ # If the user specified which HCD they want, trust them.
-+ if [ -n "$HCD" ]; then
-+ modprobe -q $HCD >/dev/null 2>&1
-+ else
-+ # "new style" HCDs ... more common code
-+ modprobe -q ehci-hcd >/dev/null 2>&1
-+ modprobe -q ohci-hcd >/dev/null 2>&1
-+ modprobe -q uhci-hcd >/dev/null 2>&1
-+
-+ # "old style" HCDs ... more driver-specific bugs
-+ modprobe -q usb-ohci >/dev/null 2>&1
-+ # NOTE: this prefers "uhci"; you may prefer "usb-uhci".
-+ # modprobe -q usb-uhci >/dev/null 2>&1 || modprobe -q uhci >/dev/null 2>&1
-+ modprobe -q uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1
-+
-+ # ... add any non-PCI HCDS here. Examples include the
-+ # CRIS usb-host, Philips ISP-1161, Symlogic 811HS, and so on.
-+ # ohci-hcd can handle some non-pci variants.
-+ fi
-
- if [ -d /proc/bus/usb ]; then
- # If we see there are no busses, we "failed" and
diff --git a/hotplug/hotplug_20040329.bb b/hotplug/hotplug_20040329.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/hotplug/hotplug_20040329.bb
+++ /dev/null
diff --git a/hotplug/hotplug_20040920.bb b/hotplug/hotplug_20040920.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/hotplug/hotplug_20040920.bb
+++ /dev/null