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-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

Browse source 
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  mmc_spi: Fix unterminated of_match_table
  of/sparc: fix build regression from of_device changes
  of/device: Replace struct of_device with struct platform_device
This commit is contained in:
Linus Torvalds 2010-08-12 09:11:31 -07:00
commit 58d4ea65b9
159 changed files with 523 additions and 530 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/pcmcia/electra_cf.c
View file

@ -44,7 +44,7 @@ struct electra_cf_socket {
unsigned present:1;
unsigned active:1;
struct of_device *ofdev;
struct platform_device *ofdev;
unsigned long mem_phys;
void __iomem * mem_base;
unsigned long mem_size;
@ -181,7 +181,7 @@ static struct pccard_operations electra_cf_ops = {
.set_mem_map = electra_cf_set_mem_map,
};
static int __devinit electra_cf_probe(struct of_device *ofdev,
static int __devinit electra_cf_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
struct device *device = &ofdev->dev;
@ -325,7 +325,7 @@ fail1:
}
static int __devexit electra_cf_remove(struct of_device *ofdev)
static int __devexit electra_cf_remove(struct platform_device *ofdev)
{
struct device *device = &ofdev->dev;
struct electra_cf_socket *cf;

4
drivers/pcmcia/m8xx_pcmcia.c
View file

@ -1149,7 +1149,7 @@ static struct pccard_operations m8xx_services = {
.set_mem_map = m8xx_set_mem_map,
};
static int __init m8xx_probe(struct of_device *ofdev,
static int __init m8xx_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
struct pcmcia_win *w;
@ -1249,7 +1249,7 @@ static int __init m8xx_probe(struct of_device *ofdev,
return 0;
}
static int m8xx_remove(struct of_device *ofdev)
static int m8xx_remove(struct platform_device *ofdev)
{
u32 m, i;
struct pcmcia_win *w;