Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41199
b: refs/heads/master
c: af9e076
h: refs/heads/master
i:
  41197: 8f27ca7
  41195: 7f4d04b
  41191: 6494252
  41183: 804ae7d
v: v3
  • Loading branch information
Adrian Bunk authored and Greg Kroah-Hartman committed Dec 1, 2006
1 parent 0865678 commit 9de893c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 5ab699810d46011ad2195c5916f3cbc684bfe3ee
refs/heads/master: af9e0765362151b27372c14d9d6dc417184182d3
4 changes: 2 additions & 2 deletions trunk/drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ void device_initialize(struct device *dev)
}

#ifdef CONFIG_SYSFS_DEPRECATED
int setup_parent(struct device *dev, struct device *parent)
static int setup_parent(struct device *dev, struct device *parent)
{
/* Set the parent to the class, not the parent device */
/* this keeps sysfs from having a symlink to make old udevs happy */
Expand Down Expand Up @@ -418,7 +418,7 @@ static int virtual_device_parent(struct device *dev)
return 0;
}

int setup_parent(struct device *dev, struct device *parent)
static int setup_parent(struct device *dev, struct device *parent)
{
int error;

Expand Down

0 comments on commit 9de893c

Please sign in to comment.