Merge branch 'master' into f15

Conflicts:
	lirc.init

lirc.init

@@ -79,12 +79,14 @@ start() {
     # we disable the in-kernel decoding when lircd is started up
     # successfully
     if [ $retval -eq 0 ]; then
+        if [ $(echo "$LIRC_DRIVER" | grep -c "dev.*input") -lt 1 ]; then
             rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
             for rc in $rcs
             do
                 echo lirc > ${rc}
             done
         fi
+    fi
 
     return $retval
 }

lirc.spec

@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -297,6 +297,10 @@ fi
 
 
 %changelog
+* Tue May 03 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-2
+- Only disable in-kernel IR decoders if we're not using devinput mode,
+  as they're actually required for devinput mode to work right.
+
 * Sat Mar 26 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-1
 - Update to lirc 0.9.0 release
 - Disable in-kernel IR decoding when starting up lircd, reenable on shutdown