Fix #58686 and #80716.

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

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

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.
 

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"