Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235674
b: refs/heads/master
c: 34381c2
h: refs/heads/master
v: v3
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Jan 21, 2011
1 parent dbe8f32 commit 20a780e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 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: eb8393926688a6ce784c35d26dcde005e769bbdc
refs/heads/master: 34381c22b0a26ef6663f5fd92574d3f45243cabf
18 changes: 9 additions & 9 deletions trunk/drivers/staging/vt6655/device_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ static int device_notify_reboot(struct notifier_block *, unsigned long event, vo
static int viawget_suspend(struct pci_dev *pcid, pm_message_t state);
static int viawget_resume(struct pci_dev *pcid);
struct notifier_block device_notifier = {
notifier_call: device_notify_reboot,
next: NULL,
priority: 0
.notifier_call = device_notify_reboot,
.next = NULL,
.priority = 0,
};
#endif

Expand Down Expand Up @@ -3606,13 +3606,13 @@ static int ethtool_ioctl(struct net_device *dev, void *useraddr)
MODULE_DEVICE_TABLE(pci, vt6655_pci_id_table);

static struct pci_driver device_driver = {
name: DEVICE_NAME,
id_table: vt6655_pci_id_table,
probe: vt6655_probe,
remove: vt6655_remove,
.name = DEVICE_NAME,
.id_table = vt6655_pci_id_table,
.probe = vt6655_probe,
.remove = vt6655_remove,
#ifdef CONFIG_PM
suspend: viawget_suspend,
resume: viawget_resume,
.suspend = viawget_suspend,
.resume = viawget_resume,
#endif
};

Expand Down

0 comments on commit 20a780e

Please sign in to comment.