r3679 - in trunk/utils/initrd-tools: . debian

[Sven Luther]

Author: luther
Date: 2005-08-03 06:15:43 +0000 (Wed, 03 Aug 2005)
New Revision: 3679

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
Let's add ehci into the initrd too, since it seems that it needs to be loaded
before uhci/ohci.


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-08-03 05:44:21 UTC (rev 3678)
+++ trunk/utils/initrd-tools/debian/changelog	2005-08-03 06:15:43 UTC (rev 3679)
@@ -8,11 +8,14 @@
     - Fix module_exists function closes: #312213
     - don't include drbd module closes: #312207
       both thanks to patch from Andreas Schultz <aschultz at warp10.net>
-  * dann frazier
+  * Dann Frazier
     - Specify options before arguments to find to avoid some annoying
       warnings.  Patch from Knut Auvor Grythe closes: #315715
+  * Sven Luther
+    - Let's load ehci before uhci and ohci, since it seems passing control
+      from ohci or uhci to ehci brings some unstabilities.
 
- -- dann frazier <dannf at debian.org>  Mon, 27 Jun 2005 19:02:32 -0600
+ -- Sven Luther <luther at debian.org>  Wed,  3 Aug 2005 08:13:18 +0200
 
 initrd-tools (0.1.81) unstable; urgency=high
 

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-08-03 05:44:21 UTC (rev 3678)
+++ trunk/utils/initrd-tools/mkinitrd	2005-08-03 06:15:43 UTC (rev 3679)
@@ -1132,7 +1132,7 @@
 
 	# Let's add the keyboard input modules on powerpc
 	if [ `dpkg --print-architecture` = "powerpc" ]; then
-		for m in i8042 atkbd ohci-hcd uhci-hcd usbhid; do
+		for m in i8042 atkbd ehci-hcd ohci-hcd uhci-hcd usbhid; do
 			echo ". $m 2> /dev/null" >> modules.3;
 		done;
 	fi
@@ -1271,6 +1271,7 @@
 			echo "      ;;" >>initrd/loadmodules.powerpc
 			echo "  esac" >>initrd/loadmodules.powerpc
 			echo "done < /proc/cpuinfo" >>initrd/loadmodules.powerpc
+			echo "modprobe -k ehci-hcd" >>initrd/loadmodules.powerpc
 			echo "modprobe -k ohci-hcd" >>initrd/loadmodules.powerpc
 			echo "modprobe -k uhci-hcd" >>initrd/loadmodules.powerpc
 			echo "modprobe -k usbhid" >>initrd/loadmodules.powerpc