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 6ce1cbd7704f1f5738c13465806c3d70d9eae333..a9d62820d759222ba3f1d8f9cdd93c75cb2c8e33 100644 (file)
--- 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 7dcfb6b2dcb274f5258463f62770f099ea25a119..9d73e09e9cb2498cf8bc90f956147a200dbc3d73 100755 (executable)
--- 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 860efa33e6a349493a0be2d6ea76096c93bbf633..d5f674f846dbcc171c9c3faf1b117b8d7b46ef07 100644 (file)
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 de10959cc68b9d2ca11bc452abd4d9d3581edaa7..385420ce5ce17939a7749f06d926e9a9286c1d7a 100644 (file)
--- 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"