Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249760
b: refs/heads/master
c: 2d99036
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed May 19, 2011
1 parent 67931ed commit f320da0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 3fadc1212a53908bc28e6351a40efd148739108b
refs/heads/master: 2d9903621dbfa6524e7e98fded2fae31ef09f484
2 changes: 1 addition & 1 deletion trunk/drivers/staging/mei/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ static int mei_pci_resume(struct device *device)
static SIMPLE_DEV_PM_OPS(mei_pm_ops, mei_pci_suspend, mei_pci_resume);
#define MEI_PM_OPS (&mei_pm_ops)
#else
#define MIE_PM_OPS NULL
#define MEI_PM_OPS NULL
#endif /* CONFIG_PM */
/*
* PCI driver structure
Expand Down

0 comments on commit f320da0

Please sign in to comment.