From: Tim Yamin <plasmaroo@gentoo.org>
Date: Fri, 18 Feb 2005 18:37:15 +0000 (+0000)
Subject: Fix #58686 and #80716.
X-Git-Tag: v3.4.10.902~583
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebfd16d5d86515f0756813f7f249e6e2079c4f7f;p=genkernel.git

Fix #58686 and #80716.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@169 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/generic/linuxrc b/generic/linuxrc
index 6ce1cbd..a9d6282 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -275,7 +275,7 @@ then
 	fi
 fi
 
-if [ "${DO_evms2}" -a "${USE_LVM2_NORMAL}" -eq '1' ]
+if [ "${DO_evms2}" -a "${USE_EVMS_NORMAL}" -eq '1' ]
 then
        if [ -e '/sbin/evms_activate' ]
        then
diff --git a/genkernel b/genkernel
index 7dcfb6b..9d73e09 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.1.0h'
+GK_V='3.1.0j'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
diff --git a/pkg/udev-039.tar.bz2 b/pkg/udev-039.tar.bz2
index 860efa3..d5f674f 100644
Binary files a/pkg/udev-039.tar.bz2 and b/pkg/udev-039.tar.bz2 differ
diff --git a/x86/modules_load b/x86/modules_load
index de10959..385420c 100644
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -11,5 +11,5 @@ sim710 sym53c416"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 MODULES_LVM2="dm-mod dm-snapshot dm-mirror"