A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 19:51:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into for-next

Browse source 
Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.
This commit is contained in:
Jiri Kosina 2010-12-22 18:57:02 +01:00
commit 4b7bd36470
2029 changed files with 37852 additions and 20361 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/pcmcia/pd6729.c
View file

@ -725,17 +725,17 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,
return 0;
err_out_free_res2:
err_out_free_res2:
if (irq_mode == 1)
free_irq(dev->irq, socket);
else
del_timer_sync(&socket->poll_timer);
err_out_free_res:
err_out_free_res:
pci_release_regions(dev);
err_out_disable:
err_out_disable:
pci_disable_device(dev);
err_out_free_mem:
err_out_free_mem:
kfree(socket);
return ret;
}

2
drivers/pcmcia/pd6729.h
View file

@ -15,7 +15,7 @@
struct pd6729_socket {
int number;
int card_irq;
unsigned long io_base; /* base io address of the socket */
unsigned long io_base; /* base io address of the socket */
struct pcmcia_socket socket;
struct timer_list poll_timer;
};

2
drivers/pcmcia/pxa2xx_sharpsl.c
View file

@ -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;

2
drivers/pcmcia/sa1100_assabet.c
View file

@ -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;

2
drivers/pcmcia/sa1100_cerf.c
View file

@ -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;

2
drivers/pcmcia/sa1100_generic.c
View file

@ -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;

2
drivers/pcmcia/sa1100_h3600.c
View file

@ -219,7 +219,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = {
.socket_suspend = h3600_pcmcia_socket_suspend,
};
int __init pcmcia_h3600_init(struct device *dev)
int __devinit pcmcia_h3600_init(struct device *dev)
{
int ret = -ENODEV;

2
drivers/pcmcia/sa1100_shannon.c
View file

@ -113,7 +113,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = {
.socket_suspend = shannon_pcmcia_socket_suspend,
};
int __init pcmcia_shannon_init(struct device *dev)
int __devinit pcmcia_shannon_init(struct device *dev)
{
int ret = -ENODEV;

2
drivers/pcmcia/sa1100_simpad.c
View file

@ -123,7 +123,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = {
.socket_suspend = simpad_pcmcia_socket_suspend,
};
int __init pcmcia_simpad_init(struct device *dev)
int __devinit pcmcia_simpad_init(struct device *dev)
{
int ret = -ENODEV;

10
drivers/pcmcia/soc_common.c
View file

@ -57,14 +57,20 @@ module_param(pc_debug, int, 0644);
void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func,
int lvl, const char *fmt, ...)
{
struct va_format vaf;
va_list args;
if (pc_debug > lvl) {
printk(KERN_DEBUG "skt%u: %s: ", skt->nr, func);
va_start(args, fmt);
vprintk(fmt, args);
vaf.fmt = fmt;
vaf.va = &args;
printk(KERN_DEBUG "skt%u: %s: %pV", skt->nr, func, &vaf);
va_end(args);
}
}
EXPORT_SYMBOL(soc_pcmcia_debug);
#endif