sdio: add SDIO_FBR_BASE(f) macro

[linux-2.6] / include / asm-i386 / topology.h

diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h
index ac58580ad6647a86d30dd4ae5928c4c1b87a26ca..19b2dafd0c81b1f822e8fa34d8b65c91cd0378c6 100644 (file)
--- a/include/asm-i386/topology.h
+++ b/include/asm-i386/topology.h
@@ -67,7 +67,7 @@ static inline int node_to_first_cpu(int node)
        return first_cpu(mask);
 }
 
-#define pcibus_to_node(bus) ((long) (bus)->sysdata)
+#define pcibus_to_node(bus) ((struct pci_sysdata *)((bus)->sysdata))->node
 #define pcibus_to_cpumask(bus) node_to_cpumask(pcibus_to_node(bus))
 
 /* sched_domains SD_NODE_INIT for NUMAQ machines */
@@ -85,7 +85,6 @@ static inline int node_to_first_cpu(int node)
        .idle_idx               = 1,                    \
        .newidle_idx            = 2,                    \
        .wake_idx               = 1,                    \
-       .per_cpu_gain           = 100,                  \
        .flags                  = SD_LOAD_BALANCE       \
                                | SD_BALANCE_EXEC       \
                                | SD_BALANCE_FORK       \