[arch-commits] Commit in fcpcmcia/trunk (3 files)

[Tobias Powalowski]

    Date: Wednesday, August 4, 2010 @ 16:21:44
  Author: tpowa
Revision: 86809

upgpkg: fcpcmcia 31107-52
bump to new major kernel

Modified:
  fcpcmcia/trunk/PKGBUILD
  fcpcmcia/trunk/fcpcmcia.install
  fcpcmcia/trunk/kernel-2.6.35.patch

---------------------+
 PKGBUILD            |    4 +-
 fcpcmcia.install    |    4 +-
 kernel-2.6.35.patch |   79 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-04 19:40:34 UTC (rev 86808)
+++ PKGBUILD	2010-08-04 20:21:44 UTC (rev 86809)
@@ -26,7 +26,7 @@
          '34f5b78b219de8ce12793b16e0171e87'
          '410f077bbe271e924be6d8b6b5f9540d'
          '224a7679645a51929f8d5e1f210d7a9e'
-         'd2ee9899095c23535f31ba4f2e4759e7')
+         '3a8dcddd077fc301a23a038d5f0aa11f')
 fi
 if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz
         pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\
@@ -43,7 +43,7 @@
          '34f5b78b219de8ce12793b16e0171e87'
          '410f077bbe271e924be6d8b6b5f9540d'
          '224a7679645a51929f8d5e1f210d7a9e'
-         'd2ee9899095c23535f31ba4f2e4759e7')
+         '3a8dcddd077fc301a23a038d5f0aa11f')
 fi
 install=(fcpcmcia.install)
 options=(!makeflags)

Modified: fcpcmcia.install
===================================================================
--- fcpcmcia.install	2010-08-04 19:40:34 UTC (rev 86808)
+++ fcpcmcia.install	2010-08-04 20:21:44 UTC (rev 86809)
@@ -9,7 +9,7 @@
   sed -i -e 's/#fcpcmcia	-	-	-	-	-	-/fcpcmcia	-	-	-	-	-	-/g' /etc/capi.conf
     # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.34-ARCH
+  KERNEL_VERSION=2.6.35-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
@@ -24,7 +24,7 @@
   sed -i -e 's/fcpcmcia	-	-	-	-	-	-/#fcpcmcia	-	-	-	-	-	-/g' /etc/capi.conf
     # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.34-ARCH
+  KERNEL_VERSION=2.6.35-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 

Modified: kernel-2.6.35.patch
===================================================================
--- kernel-2.6.35.patch	2010-08-04 19:40:34 UTC (rev 86808)
+++ kernel-2.6.35.patch	2010-08-04 20:21:44 UTC (rev 86809)
@@ -100,3 +100,82 @@
  } /* cs_attach */
  
  /*======================================================================
+--- fcpcmcia_cs.c~	2010-08-04 22:01:27.123336123 +0200
++++ fcpcmcia_cs.c	2010-08-04 22:01:27.150002183 +0200
+@@ -146,9 +146,6 @@
+     p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+     p_dev->io.NumPorts2 = 0;
+ 
+-    /* Interrupt setup */
+-    p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
+-
+ #if defined (PCMCIA_IRQ_INFO2)
+     p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
+     if (irq_list_count > 0) {
+@@ -214,7 +211,7 @@
+ 
+ static int cs_config(struct pcmcia_device *link)
+ {
+-    int i;
++    int i = -1;
+     char devname[128];
+ 
+     devname[0] = 0;
+@@ -228,8 +225,7 @@
+ 	/*
+ 	 * allocate an interrupt line
+ 	 */
+-	i = pcmcia_request_irq(link, &link->irq);
+-	if (i != 0) {
++	if (!link->irq) {
+             /* undo */
+             pcmcia_disable_device(link);
+ 	    break;
+@@ -259,7 +255,7 @@
+ 		"Failed to add AVM-%s-Controller at i/o %x, irq %d\n",
+ 		dev->node.dev_name, 
+ 		link->io.BasePort1, 
+-		link->irq.AssignedIRQ
++		link->irq
+ 	);
+ 	cs_release(link);
+ 	return -ENODEV;
+@@ -270,7 +266,7 @@
+ 	"Card driver for '%s' has been set up: i/o %x, irq %d\n", 
+ 	devname, 
+ 	link->io.BasePort1, 
+-	link->irq.AssignedIRQ
++	link->irq
+     );
+     return 0;
+ } /* cs_config */
+--- fcpcmcia_cs.c~	2010-08-04 22:04:40.550002169 +0200
++++ fcpcmcia_cs.c	2010-08-04 22:04:40.573335565 +0200
+@@ -250,7 +250,7 @@
+     }
+     NOTE("Ready to call card driver for '%s'...\n", devname);
+ 
+-    if ((i = fcpcmcia_addcard(link->io.BasePort1, link->irq.AssignedIRQ)) < 0) {
++    if ((i = fcpcmcia_addcard(link->io.BasePort1, link->irq)) < 0) {
+         ERROR(
+ 		"Failed to add AVM-%s-Controller at i/o %x, irq %d\n",
+ 		dev->node.dev_name, 
+@@ -281,7 +281,7 @@
+ 
+ static void cs_release(struct pcmcia_device *link)
+ {
+-    fcpcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ);
++    fcpcmcia_delcard(link->io.BasePort1, link->irq);
+ 
+     pcmcia_disable_device(link);
+ } /* cs_release */
+--- fcpcmcia_cs.c~	2010-08-04 22:22:29.090002845 +0200
++++ fcpcmcia_cs.c	2010-08-04 22:22:29.113335966 +0200
+@@ -253,7 +253,6 @@
+     if ((i = fcpcmcia_addcard(link->io.BasePort1, link->irq)) < 0) {
+         ERROR(
+ 		"Failed to add AVM-%s-Controller at i/o %x, irq %d\n",
+-		dev->node.dev_name, 
+ 		link->io.BasePort1, 
+ 		link->irq
+ 	);