Merge SSB driver from tree at bu3sch.de, pulled 24/6

[librecmc/librecmc.git] / target / linux / brcm47xx-2.6 / files / drivers / ssb / ssb_private.h

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/ssb_private.h b/target/linux/brcm47xx-2.6/files/drivers/ssb/ssb_private.h
index ae1fc0633d2fada000451c2a01a8c42a5cc30fdb..d00d186074c7c071e32b6b6730f9f7a565bbc74c 100644 (file)
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/ssb_private.h
+++ b/target/linux/brcm47xx-2.6/files/drivers/ssb/ssb_private.h
@@ -51,8 +51,8 @@ extern int ssb_pci_switch_coreidx(struct ssb_bus *bus,
                                  u8 coreidx);
 extern int ssb_pci_xtal(struct ssb_bus *bus, u32 what,
                        int turn_on);
-extern int ssb_pci_sprom_get(struct ssb_bus *bus);
-extern void ssb_pci_get_boardtype(struct ssb_bus *bus);
+extern int ssb_pci_get_invariants(struct ssb_bus *bus,
+                                 struct ssb_init_invariants *iv);
 extern void ssb_pci_exit(struct ssb_bus *bus);
 extern int ssb_pci_init(struct ssb_bus *bus);
 extern const struct ssb_bus_ops ssb_pci_ops;
@@ -74,13 +74,6 @@ static inline int ssb_pci_xtal(struct ssb_bus *bus, u32 what,
 {
        return 0;
 }
-static inline int ssb_pci_sprom_get(struct ssb_bus *bus)
-{
-       return 0;
-}
-static inline void ssb_pci_get_boardtype(struct ssb_bus *bus)
-{
-}
 static inline void ssb_pci_exit(struct ssb_bus *bus)
 {
 }
@@ -99,6 +92,8 @@ extern int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus,
                                     u8 coreidx);
 extern int ssb_pcmcia_switch_segment(struct ssb_bus *bus,
                                     u8 seg);
+extern int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
+                                    struct ssb_init_invariants *iv);
 extern int ssb_pcmcia_init(struct ssb_bus *bus);
 extern const struct ssb_bus_ops ssb_pcmcia_ops;
 #else /* CONFIG_SSB_PCMCIAHOST */
@@ -139,13 +134,4 @@ extern int ssb_devices_thaw(struct ssb_bus *bus);
 extern struct ssb_bus * ssb_pci_dev_to_bus(struct pci_dev *pdev);
 #endif /* CONFIG_SSB_PCIHOST */
 
-
-/* Ceiling division helper. Divides x by y. */
-static inline
-unsigned long ceildiv(unsigned long x, unsigned long y)
-{
-       return ((x + (y - 1)) / y);
-}
-
-
 #endif /* LINUX_SSB_PRIVATE_H_ */