Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0143832c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  drivers/pcmcia/soc_common.c: Use printf extension %pV
  pcmcia: fix warning in synclink driver
  pcmcia/sa1100: don't put machine specific init functions in .init.text
  pcmcia/cm4000: fix error code
  pd6729: Coding Style fixes
parents f8b372a1 106665d9

drivers/char/pcmcia/cm4000_cs.c

+2 −1
Original line number Diff line number Diff line
@@ -979,8 +979,9 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count, 
		if (dev->flags0 & 1) {

			set_bit(IS_CMM_ABSENT, &dev->flags);

			rc = -ENODEV;

		}

		} else {

			rc = -EIO;

		}

		goto release_io;

	}

drivers/pcmcia/pxa2xx_sharpsl.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { 
#ifdef CONFIG_SA1100_COLLIE

#include "sa11xx_base.h"



int __init pcmcia_collie_init(struct device *dev)

int __devinit pcmcia_collie_init(struct device *dev)

{

       int ret = -ENODEV;

drivers/pcmcia/sa1100_assabet.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = { 
	.socket_suspend		= assabet_pcmcia_socket_suspend,

};



int pcmcia_assabet_init(struct device *dev)

int __devinit pcmcia_assabet_init(struct device *dev)

{

	int ret = -ENODEV;

drivers/pcmcia/sa1100_cerf.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = { 
	.socket_suspend		= cerf_pcmcia_socket_suspend,

};



int __init pcmcia_cerf_init(struct device *dev)

int __devinit pcmcia_cerf_init(struct device *dev)

{

	int ret = -ENODEV;

drivers/pcmcia/sa1100_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = { 
#endif

};



static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)

static int __devinit sa11x0_drv_pcmcia_probe(struct platform_device *dev)

{

	int i, ret = -ENODEV;