Re: 2.6.12-rc5-mm1

[Brice Goglin <Brice.Goglin@ens-lyon.org>]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

Andrew Morton a écrit :
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/

Hi Andrew,

drivers/pcmcia/ds.c defines pcmcia_store_allow_func_id_match
without the new "struct device_attribute *attr" argument.
The attached patch fixes this.

Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>

Regards,
Brice

[-- Attachment #2: fix-pcmcia-ds-device-attribute.patch --]
[-- Type: text/x-patch, Size: 577 bytes --]

--- linux-mm/drivers/pcmcia/ds.c.old	2005-05-25 23:54:03.000000000 +0200
+++ linux-mm/drivers/pcmcia/ds.c	2005-05-25 23:54:25.000000000 +0200
@@ -848,7 +848,8 @@ pcmcia_device_stringattr(prod_id3, prod_
 pcmcia_device_stringattr(prod_id4, prod_id[3]);
 
 
-static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, const char * buf, size_t count)
+static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, struct device_attribute *attr,
+						 const char * buf, size_t count)
 {
 	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
         if (!count)