[kernel/f13/master] fix flexcop module register retardo names

[Kyle McMartin]

commit 45fbfae2b41cdef68a2510abd2339db81dcb43eb
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date:   Fri Sep 3 16:46:09 2010 -0400

    fix flexcop module register retardo names

 flexcop-fix-xlate_proc_name-warning.patch |   30 +++++++++++++++++++++++++++++
 kernel.spec                               |    5 ++++
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/flexcop-fix-xlate_proc_name-warning.patch b/flexcop-fix-xlate_proc_name-warning.patch
new file mode 100644
index 0000000..82b50a4
--- /dev/null
+++ b/flexcop-fix-xlate_proc_name-warning.patch
@@ -0,0 +1,30 @@
+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 at 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 df468da..af501ab 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -773,6 +773,7 @@ Patch12500: irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
 Patch12510: wireless-extensions-fix-kernel-heap-content-leak.patch
 Patch12515: sanity-check-bond-proc_entry.patch
 Patch12516: asix-use-eth_mac_addr.patch
+Patch12517: flexcop-fix-xlate_proc_name-warning.patch
 
 %endif
 
@@ -1450,6 +1451,9 @@ ApplyPatch sanity-check-bond-proc_entry.patch
 # bz #629871
 ApplyPatch asix-use-eth_mac_addr.patch
 
+# bz #575873
+ApplyPatch flexcop-fix-xlate_proc_name-warning.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2075,6 +2079,7 @@ fi
 - sanity-check-bond-proc_entry.patch (rhbz#604630)
 - asix.c: stub out set_mac_address in case it's breaking things (rhbz#629871)
 - default to pci=nocrs
+- flexcop: fix registering braindead stupid names (#575873)
 
 * Fri Sep 03 2010 Kyle McMartin <kmcmartin at redhat.com> 2.6.34.6-51
 - lirc_imon: move alloc before use (rhbz#629980)