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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
video
/
via
/
viafbdev.h
diff --git
a/drivers/video/via/viafbdev.h
b/drivers/video/via/viafbdev.h
index
4960e3d
..
d66f963
100644
(file)
--- a/
drivers/video/via/viafbdev.h
+++ b/
drivers/video/via/viafbdev.h
@@
-108,6
+108,4
@@
void via_fb_pci_remove(struct pci_dev *pdev);
/* Temporary */
int viafb_init(void);
void viafb_exit(void);
-int viafb_suspend(struct pci_dev *pdev, pm_message_t state);
-int viafb_resume(struct pci_dev *pdev);
#endif /* __VIAFBDEV_H__ */