diff options
| author | Andy Whitcroft | 2006-01-13 13:35:49 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2006-01-14 01:12:16 +0100 |
| commit | 7a45fb19cef93574230827e6e2c97ad5760ddecd (patch) | |
| tree | 89c4d2628f7d8acea2e7c315097bb4488a7e8070 /include/asm-powerpc | |
| parent | powerpc: Provide a suitable AT_PLATFORM value (diff) | |
| download | kernel-qcow2-linux-7a45fb19cef93574230827e6e2c97ad5760ddecd.tar.gz kernel-qcow2-linux-7a45fb19cef93574230827e6e2c97ad5760ddecd.tar.xz kernel-qcow2-linux-7a45fb19cef93574230827e6e2c97ad5760ddecd.zip | |
[PATCH] powerpc: oprofile cpu type names clash with other code
In 2.6.15-git6 a change was commited in the oprofile support in
the powerpc architecture. It introduced the powerpc_oprofile_type
which contains the define G4. This causes a name clash with the
existing wacom usb tablet driver.
CC [M] drivers/usb/input/wacom.o
drivers/usb/input/wacom.c:98: error: conflicting types for `G4'
include/asm/cputable.h:37: error: previous declaration of `G4'
CC [M] drivers/usb/mon/mon_text.o
make[3]: *** [drivers/usb/input/wacom.o] Error 1
make[2]: *** [drivers/usb/input] Error 2
The elements of an enum declared in global scope are effectivly
global identifiers themselves. As such we need to ensure the names
are unique. This patch updates the later oprofile support to use
unique names.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/cputable.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 03017d905704..64210549f56b 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h @@ -32,11 +32,11 @@ struct cpu_spec; typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec); enum powerpc_oprofile_type { - INVALID = 0, - RS64 = 1, - POWER4 = 2, - G4 = 3, - BOOKE = 4, + PPC_OPROFILE_INVALID = 0, + PPC_OPROFILE_RS64 = 1, + PPC_OPROFILE_POWER4 = 2, + PPC_OPROFILE_G4 = 3, + PPC_OPROFILE_BOOKE = 4, }; struct cpu_spec { |