Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274961
b: refs/heads/master
c: 1bba688
h: refs/heads/master
i:
  274959: a23306e
v: v3
  • Loading branch information
Axel Lin authored and Artem Bityutskiy committed Oct 1, 2011
1 parent 94ba916 commit ba3c2ae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ada766e959f1040311e05b11dd04921f4c29d5cc
refs/heads/master: 1bba688b5a32079db616f281c13f00944d74020b
6 changes: 3 additions & 3 deletions trunk/drivers/mtd/nand/r852.c
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ void r852_shutdown(struct pci_dev *pci_dev)
}

#ifdef CONFIG_PM
int r852_suspend(struct device *device)
static int r852_suspend(struct device *device)
{
struct r852_device *dev = pci_get_drvdata(to_pci_dev(device));

Expand All @@ -1048,7 +1048,7 @@ int r852_suspend(struct device *device)
return 0;
}

int r852_resume(struct device *device)
static int r852_resume(struct device *device)
{
struct r852_device *dev = pci_get_drvdata(to_pci_dev(device));

Expand Down Expand Up @@ -1092,7 +1092,7 @@ static const struct pci_device_id r852_pci_id_tbl[] = {

MODULE_DEVICE_TABLE(pci, r852_pci_id_tbl);

SIMPLE_DEV_PM_OPS(r852_pm_ops, r852_suspend, r852_resume);
static SIMPLE_DEV_PM_OPS(r852_pm_ops, r852_suspend, r852_resume);

static struct pci_driver r852_pci_driver = {
.name = DRV_NAME,
Expand Down

0 comments on commit ba3c2ae

Please sign in to comment.