From 119b59cd0df00269bfe51d906657193217b8c884 Mon Sep 17 00:00:00 2001 From: Chris Larson <clarson@kergoth.com> Date: Thu, 25 Nov 2004 10:19:50 +0000 Subject: Remove the EOLN_NATIVE flag from a ton of files (patches & the like for which line ending conversions can break things). BKrev: 41a5b1c6eA2OPeQrDQEgEwAmKXvQJg --- hotplug/files/collie/usbd | 1 + hotplug/files/sysconfig-hotplug | 12 ++++++ hotplug/files/tosa/sysconfig-usb | 2 + hotplug/files/usbd | 2 + hotplug/hotplug-20040920/userspecified_hcd.patch | 55 ++++++++++++++++++++++++ 5 files changed, 72 insertions(+) (limited to 'hotplug') diff --git a/hotplug/files/collie/usbd b/hotplug/files/collie/usbd index e69de29bb2..38aff0adcb 100644 --- a/hotplug/files/collie/usbd +++ b/hotplug/files/collie/usbd @@ -0,0 +1 @@ +usbdmodule="sa1100_bi" diff --git a/hotplug/files/sysconfig-hotplug b/hotplug/files/sysconfig-hotplug index e69de29bb2..7ee5a20c31 100644 --- a/hotplug/files/sysconfig-hotplug +++ b/hotplug/files/sysconfig-hotplug @@ -0,0 +1,12 @@ +## +## 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/tosa/sysconfig-usb b/hotplug/files/tosa/sysconfig-usb index e69de29bb2..cbd18c6566 100644 --- a/hotplug/files/tosa/sysconfig-usb +++ b/hotplug/files/tosa/sysconfig-usb @@ -0,0 +1,2 @@ +## Specify the USB host controller driver +HCD="usb_ohci_tc6393" diff --git a/hotplug/files/usbd b/hotplug/files/usbd index e69de29bb2..aa4e6d2de7 100644 --- a/hotplug/files/usbd +++ b/hotplug/files/usbd @@ -0,0 +1,2 @@ +usbdmodule="" + diff --git a/hotplug/hotplug-20040920/userspecified_hcd.patch b/hotplug/hotplug-20040920/userspecified_hcd.patch index e69de29bb2..c2ceeb686e 100644 --- a/hotplug/hotplug-20040920/userspecified_hcd.patch +++ b/hotplug/hotplug-20040920/userspecified_hcd.patch @@ -0,0 +1,55 @@ + +# +# 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 -- cgit v1.2.3