diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
| commit | 55faed1e607a24ca7f3453a3eb463ca8987f8139 (patch) | |
| tree | 70c1f910576713e799b5b409d9f4c3c56840526e /drivers/net/dm9000.c | |
| parent | 946e91f36e90eea46758dd725b1c3b239f270f68 (diff) | |
| parent | 0edd5b44913cd0aba6f23b626b407f70bb3fb018 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/dm9000.c')
| -rw-r--r-- | drivers/net/dm9000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 6440a892bb81..e54fc10f6846 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
| @@ -1140,7 +1140,7 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value) | |||
| 1140 | } | 1140 | } |
| 1141 | 1141 | ||
| 1142 | static int | 1142 | static int |
| 1143 | dm9000_drv_suspend(struct device *dev, u32 state, u32 level) | 1143 | dm9000_drv_suspend(struct device *dev, pm_message_t state, u32 level) |
| 1144 | { | 1144 | { |
| 1145 | struct net_device *ndev = dev_get_drvdata(dev); | 1145 | struct net_device *ndev = dev_get_drvdata(dev); |
| 1146 | 1146 | ||