diff options
| author | Hirokazu Takata <takata@linux-m32r.org> | 2005-06-23 03:08:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:45:08 -0400 |
| commit | 4a35293667f8691b45fdb72770f087c086fb9702 (patch) | |
| tree | d128481d011dab5c030ddea816ba518446fbc4dd /include | |
| parent | 8a9e1b0f564615bd92ba50162623e25c2904e564 (diff) | |
[PATCH] m32r: build fix for asm-m32r/topology.h
Use asm-generic/topology.h to fix yet another pcibus_to_node() build error.
Cc: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m32r/topology.h | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/include/asm-m32r/topology.h b/include/asm-m32r/topology.h index 299a89d91bde..d607eb32bd7e 100644 --- a/include/asm-m32r/topology.h +++ b/include/asm-m32r/topology.h | |||
| @@ -1,48 +1,6 @@ | |||
| 1 | /* | ||
| 2 | * linux/include/asm-generic/topology.h | ||
| 3 | * | ||
| 4 | * Written by: Matthew Dobson, IBM Corporation | ||
| 5 | * | ||
| 6 | * Copyright (C) 2002, IBM Corp. | ||
| 7 | * | ||
| 8 | * All rights reserved. | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License as published by | ||
| 12 | * the Free Software Foundation; either version 2 of the License, or | ||
| 13 | * (at your option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but | ||
| 16 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or | ||
| 18 | * NON INFRINGEMENT. See the GNU General Public License for more | ||
| 19 | * details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with this program; if not, write to the Free Software | ||
| 23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 24 | * | ||
| 25 | * Send feedback to <colpatch@us.ibm.com> | ||
| 26 | */ | ||
| 27 | #ifndef _ASM_M32R_TOPOLOGY_H | 1 | #ifndef _ASM_M32R_TOPOLOGY_H |
| 28 | #define _ASM_M32R_TOPOLOGY_H | 2 | #define _ASM_M32R_TOPOLOGY_H |
| 29 | 3 | ||
| 30 | /* Other architectures wishing to use this simple topology API should fill | 4 | #include <asm-generic/topology.h> |
| 31 | in the below functions as appropriate in their own <asm/topology.h> file. */ | ||
| 32 | |||
| 33 | #define cpu_to_node(cpu) (0) | ||
| 34 | |||
| 35 | #ifndef parent_node | ||
| 36 | #define parent_node(node) (0) | ||
| 37 | #endif | ||
| 38 | #ifndef node_to_cpumask | ||
| 39 | #define node_to_cpumask(node) (cpu_online_map) | ||
| 40 | #endif | ||
| 41 | #ifndef node_to_first_cpu | ||
| 42 | #define node_to_first_cpu(node) (0) | ||
| 43 | #endif | ||
| 44 | #ifndef pcibus_to_cpumask | ||
| 45 | #define pcibus_to_cpumask(bus) (cpu_online_map) | ||
| 46 | #endif | ||
| 47 | 5 | ||
| 48 | #endif /* _ASM_M32R_TOPOLOGY_H */ | 6 | #endif /* _ASM_M32R_TOPOLOGY_H */ |