git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
This commit was generated by cvs2svn to compensate for changes in r655,
[linux-2.6.git]
/
drivers
/
net
/
bmac.c
diff --git
a/drivers/net/bmac.c
b/drivers/net/bmac.c
index
3d2be7c
..
734bd4e
100644
(file)
--- a/
drivers/net/bmac.c
+++ b/
drivers/net/bmac.c
@@
-455,7
+455,7
@@
static void bmac_init_chip(struct net_device *dev)
}
#ifdef CONFIG_PM
-static int bmac_suspend(struct macio_dev *mdev,
u32
state)
+static int bmac_suspend(struct macio_dev *mdev,
pm_message_t
state)
{
struct net_device* dev = macio_get_drvdata(mdev);
struct bmac_data *bp = netdev_priv(dev);