diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /hotplug/hotplug-20040920/userspecified_hcd.patch | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (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/hotplug-20040920/userspecified_hcd.patch')
| -rw-r--r-- | hotplug/hotplug-20040920/userspecified_hcd.patch | 55 |
1 files changed, 0 insertions, 55 deletions
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 |