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-28 18:51:56 -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

4
drivers/watchdog/cpwd.c
View file

@ -526,7 +526,7 @@ static const struct file_operations cpwd_fops = {
.release = cpwd_release,
};
static int __devinit cpwd_probe(struct of_device *op,
static int __devinit cpwd_probe(struct platform_device *op,
const struct of_device_id *match)
{
struct device_node *options;
@ -639,7 +639,7 @@ out_free:
goto out;
}
static int __devexit cpwd_remove(struct of_device *op)
static int __devexit cpwd_remove(struct platform_device *op)
{
struct cpwd *p = dev_get_drvdata(&op->dev);
int i;

2
drivers/watchdog/gef_wdt.c
View file

@ -260,7 +260,7 @@ static struct miscdevice gef_wdt_miscdev = {
};
static int __devinit gef_wdt_probe(struct of_device *dev,
static int __devinit gef_wdt_probe(struct platform_device *dev,
const struct of_device_id *match)
{
int timeout = 10;

4
drivers/watchdog/mpc8xxx_wdt.c
View file

@ -185,7 +185,7 @@ static struct miscdevice mpc8xxx_wdt_miscdev = {
.fops = &mpc8xxx_wdt_fops,
};
static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev,
static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev,
const struct of_device_id *match)
{
int ret;
@ -238,7 +238,7 @@ err_unmap:
return ret;
}
static int __devexit mpc8xxx_wdt_remove(struct of_device *ofdev)
static int __devexit mpc8xxx_wdt_remove(struct platform_device *ofdev)
{
mpc8xxx_wdt_pr_warn("watchdog removed");
del_timer_sync(&wdt_timer);

4
drivers/watchdog/riowd.c
View file

@ -172,7 +172,7 @@ static struct miscdevice riowd_miscdev = {
.fops = &riowd_fops
};
static int __devinit riowd_probe(struct of_device *op,
static int __devinit riowd_probe(struct platform_device *op,
const struct of_device_id *match)
{
struct riowd *p;
@ -219,7 +219,7 @@ out:
return err;
}
static int __devexit riowd_remove(struct of_device *op)
static int __devexit riowd_remove(struct platform_device *op)
{
struct riowd *p = dev_get_drvdata(&op->dev);