diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
| commit | 418f19ea17a99421b22a64e101e14b6a16bed66d (patch) | |
| tree | 7c21fcc368c63f1f9907deac6d16b30bd371792d /include/linux/topology.h | |
| parent | 98444d3dd975653a4a970ecc0dfc30918da92f60 (diff) | |
| parent | f6e10b865c3ea56bdaa8c6ecfee313b997900dbb (diff) | |
Merge branch 'master' of ../mmc
Diffstat (limited to 'include/linux/topology.h')
| -rw-r--r-- | include/linux/topology.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index 117f1b7405cf..0c5b5ac36d8e 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | for_each_online_node(node) \ | 49 | for_each_online_node(node) \ |
| 50 | if (nr_cpus_node(node)) | 50 | if (nr_cpus_node(node)) |
| 51 | 51 | ||
| 52 | void arch_update_cpu_topology(void); | 52 | int arch_update_cpu_topology(void); |
| 53 | 53 | ||
| 54 | /* Conform to ACPI 2.0 SLIT distance definitions */ | 54 | /* Conform to ACPI 2.0 SLIT distance definitions */ |
| 55 | #define LOCAL_DISTANCE 10 | 55 | #define LOCAL_DISTANCE 10 |