[kernel/f14/master] Revert "ir-core, lirc and hdpvr updates"

Kyle McMartin kyle at fedoraproject.org
Fri Oct 22 14:34:13 UTC 2010


commit 8311d5168d06c679c6f4418d6687b87a558139b5
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Fri Oct 22 10:26:15 2010 -0400

    Revert "ir-core, lirc and hdpvr updates"
    
    This reverts commit 59a83bd58465a494b1e47ed7e272fa1c64f75263
    and 61d7a69fe678bb6f1805887d04ddd4b3df4fc5a2.

 kernel.spec                              |   10 +-
 linux-2.6-v4l-dvb-hdpvr-updates.patch    |  239 --
 linux-2.6-v4l-dvb-ir-core-update-4.patch | 3560 ------------------------------
 3 files changed, 1 insertions(+), 3808 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 6844b05..e7b608d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 47
+%global baserelease 46
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -705,8 +705,6 @@ Patch2917: hdpvr-ir-enable.patch
 Patch2918: linux-2.6-v4l-dvb-ir-core-update-2.patch
 Patch2919: linux-2.6-v4l-dvb-ir-core-update-3.patch
 Patch2920: linux-2.6-lirc-ioctl-compat-fixups.patch
-Patch2921: linux-2.6-v4l-dvb-ir-core-update-4.patch
-Patch2922: linux-2.6-v4l-dvb-hdpvr-updates.patch
 
 Patch2950: linux-2.6-via-velocity-dma-fix.patch
 
@@ -1365,8 +1363,6 @@ ApplyPatch hdpvr-ir-enable.patch
 ApplyPatch linux-2.6-v4l-dvb-ir-core-update-2.patch
 ApplyPatch linux-2.6-v4l-dvb-ir-core-update-3.patch
 ApplyPatch linux-2.6-lirc-ioctl-compat-fixups.patch
-ApplyPatch linux-2.6-v4l-dvb-ir-core-update-4.patch
-ApplyPatch linux-2.6-v4l-dvb-hdpvr-updates.patch
 
 # Fix DMA bug on via-velocity
 ApplyPatch linux-2.6-via-velocity-dma-fix.patch
@@ -2026,10 +2022,6 @@ fi
 # and build.
 
 %changelog
-* Tue Oct 19 2010 Jarod Wilson <jarod at redhat.com> 2.6.35.6-47
-- More ir-core and lirc updates
-- HD-PVR driver updates
-
 * Mon Oct 18 2010 Kyle McMartin <kyle at redhat.com> 2.6.35.6-46
 - Add Ricoh e822 support. (rhbz#596475) Thanks to sgruszka@ for
   sending the patches in.


More information about the scm-commits mailing list