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
atp: remove set_rx_mode_8012()
[pandora-kernel.git]
/
drivers
/
bcma
/
bcma_private.h
diff --git
a/drivers/bcma/bcma_private.h
b/drivers/bcma/bcma_private.h
index
30a3085
..
3872e0d
100644
(file)
--- a/
drivers/bcma/bcma_private.h
+++ b/
drivers/bcma/bcma_private.h
@@
-8,8
+8,6
@@
#include <linux/bcma/bcma.h>
#include <linux/delay.h>
#include <linux/bcma/bcma.h>
#include <linux/delay.h>
-#define BCMA_CORE_SIZE 0x1000
-
struct bcma_bus;
/* main.c */
struct bcma_bus;
/* main.c */
@@
-18,6
+16,9
@@
void bcma_bus_unregister(struct bcma_bus *bus);
int __init bcma_bus_early_register(struct bcma_bus *bus,
struct bcma_device *core_cc,
struct bcma_device *core_mips);
int __init bcma_bus_early_register(struct bcma_bus *bus,
struct bcma_device *core_cc,
struct bcma_device *core_mips);
+#ifdef CONFIG_PM
+int bcma_bus_resume(struct bcma_bus *bus);
+#endif
/* scan.c */
int bcma_bus_scan(struct bcma_bus *bus);
/* scan.c */
int bcma_bus_scan(struct bcma_bus *bus);