git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlegacy
/
common.h
diff --git
a/drivers/net/wireless/iwlegacy/common.h
b/drivers/net/wireless/iwlegacy/common.h
index
5f50177
..
3d3135e
100644
(file)
--- a/
drivers/net/wireless/iwlegacy/common.h
+++ b/
drivers/net/wireless/iwlegacy/common.h
@@
-1845,8
+1845,6
@@
__le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,
u32 beacon_interval);
#ifdef CONFIG_PM
-int il_pci_suspend(struct device *device);
-int il_pci_resume(struct device *device);
extern const struct dev_pm_ops il_pm_ops;
#define IL_LEGACY_PM_OPS (&il_pm_ops)