diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-05-01 22:17:23 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-05-01 22:17:23 -0400 |
| commit | 8e5f42dd3d5d509ecf17f4e00d798545f746fd0f (patch) | |
| tree | 3145db462513296c452e49b91a716fe2d50a9641 | |
| parent | 0ca2d8f721167219d0177ebbccc5a590ae5b7d0f (diff) | |
| download | kernel-8e5f42dd3d5d509ecf17f4e00d798545f746fd0f.tar.gz kernel-8e5f42dd3d5d509ecf17f4e00d798545f746fd0f.tar.xz kernel-8e5f42dd3d5d509ecf17f4e00d798545f746fd0f.zip | |
snapshot 2.6.39-rc5-git5
| -rw-r--r-- | flexcop-fix-xlate_proc_name-warning.patch | 30 | ||||
| -rw-r--r-- | kernel.spec | 10 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 37 deletions
diff --git a/flexcop-fix-xlate_proc_name-warning.patch b/flexcop-fix-xlate_proc_name-warning.patch deleted file mode 100644 index 82b50a47f..000000000 --- a/flexcop-fix-xlate_proc_name-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c -index 227c020..7465308 100644 ---- a/drivers/media/dvb/b2c2/flexcop-pci.c -+++ b/drivers/media/dvb/b2c2/flexcop-pci.c -@@ -39,6 +39,7 @@ MODULE_PARM_DESC(debug, - - #define DRIVER_VERSION "0.1" - #define DRIVER_NAME "Technisat/B2C2 FlexCop II/IIb/III Digital TV PCI Driver" -+#define FLEXCOP_MODULE_NAME "b2c2-flexcop" - #define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de>" - - struct flexcop_pci { -@@ -299,7 +300,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci) - return ret; - pci_set_master(fc_pci->pdev); - -- if ((ret = pci_request_regions(fc_pci->pdev, DRIVER_NAME)) != 0) -+ if ((ret = pci_request_regions(fc_pci->pdev, FLEXCOP_MODULE_NAME)) != 0) - goto err_pci_disable_device; - - fc_pci->io_mem = pci_iomap(fc_pci->pdev, 0, 0x800); -@@ -313,7 +314,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci) - pci_set_drvdata(fc_pci->pdev, fc_pci); - spin_lock_init(&fc_pci->irq_lock); - if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr, -- IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0) -+ IRQF_SHARED, FLEXCOP_MODULE_NAME, fc_pci)) != 0) - goto err_pci_iounmap; - - fc_pci->init_state |= FC_PCI_INIT; diff --git a/kernel.spec b/kernel.spec index bf652b319..a62bac336 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 1 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -696,8 +696,6 @@ Patch2912: linux-2.6-v4l-dvb-ir-core-update.patch #Patch2916: lirc-staging-2.6.36-fixes.patch -Patch2918: flexcop-fix-xlate_proc_name-warning.patch - # fs fixes # NFSv4 @@ -1311,9 +1309,6 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch # http://www.lirc.org/ #ApplyOptionalPatch lirc-staging-2.6.36-fixes.patch -# rhbz#664852 -ApplyPatch flexcop-fix-xlate_proc_name-warning.patch - # Patches headed upstream ApplyPatch disable-i8042-check-on-apple-mac.patch @@ -1941,6 +1936,9 @@ fi # and build. %changelog +* Sun May 01 2011 Kyle McMartin <kmcmartin@redhat.com> +- Update to snapshot 2.6.39-rc5-git5 + * Thu Apr 28 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc5.git1.0 - Update to snapshot 2.6.39-rc5-git1 - Edit scripts/rebase.sh to not keep appending to .gitignore when the new @@ -1,3 +1,3 @@ 7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2 e5782b89d4135200b2962b1422c0ee18 patch-2.6.39-rc5.bz2 -0b99dc3c317a3d7e803a279df6315015 patch-2.6.39-rc5-git1.bz2 +9be04fa99535fcde5c46ad953ad42377 patch-2.6.39-rc5-git5.bz2 |