diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-28 16:20:10 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:31 -0700 |
commit | b6d11c07e5fca796e426329e76b0cc6ab400c0fd (patch) | |
tree | 2c9ffa41139fca9449740fd6ba8805cbdd97cdbb /drivers/staging/rtl8187se/r8180_pm.h | |
parent | b72490a5f970051bb02602c69fa918fd53b512c9 (diff) |
Staging: rtl8187se: merge r8180_pm.c with r8180_core.c
* merge r8180_pm.c with r8180_core.c
* make functions static
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_pm.h')
-rw-r--r-- | drivers/staging/rtl8187se/r8180_pm.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/staging/rtl8187se/r8180_pm.h b/drivers/staging/rtl8187se/r8180_pm.h deleted file mode 100644 index 48ab9cd1f81d..000000000000 --- a/drivers/staging/rtl8187se/r8180_pm.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - Power management interface routines. - Written by Mariusz Matuszek. - This code is currently just a placeholder for later work and - does not do anything useful. - - This is part of rtl8180 OpenSource driver. - Copyright (C) Andrea Merello 2004 <andreamrl@tiscali.it> - Released under the terms of GPL (General Public Licence) - -*/ - - -#ifndef R8180_PM_H -#define R8180_PM_H - -#include <linux/types.h> -#include <linux/pci.h> - -int rtl8180_suspend (struct pci_dev *pdev, pm_message_t state); -int rtl8180_resume (struct pci_dev *pdev); - -#endif //R8180_PM_H - |