lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Jeff Garzik
2005-10-28 18:48:57 -04:00
parent ad18b0ea08 20731945ae
commit 596c96ba06
602 changed files with 17194 additions and 9678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/smc91x.c
View File

@@ -2295,11 +2295,11 @@ static int smc_drv_remove(struct device *dev)
return 0;
}
static int smc_drv_suspend(struct device *dev, pm_message_t state, u32 level)
static int smc_drv_suspend(struct device *dev, pm_message_t state)
{
struct net_device *ndev = dev_get_drvdata(dev);
if (ndev && level == SUSPEND_DISABLE) {
if (ndev) {
if (netif_running(ndev)) {
netif_device_detach(ndev);
smc_shutdown(ndev);
@@ -2309,12 +2309,12 @@ static int smc_drv_suspend(struct device *dev, pm_message_t state, u32 level)
return 0;
}
static int smc_drv_resume(struct device *dev, u32 level)
static int smc_drv_resume(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct net_device *ndev = dev_get_drvdata(dev);
if (ndev && level == RESUME_ENABLE) {
if (ndev) {
struct smc_local *lp = netdev_priv(ndev);
smc_enable_device(pdev);
if (netif_running(ndev)) {