]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
[PATCH] powerpc: oprofile cpu type names clash with other code
authorAndy Whitcroft <apw@shadowen.org>
Fri, 13 Jan 2006 12:35:49 +0000 (12:35 +0000)
committerPaul Mackerras <paulus@samba.org>
Sat, 14 Jan 2006 00:12:16 +0000 (11:12 +1100)
commit7a45fb19cef93574230827e6e2c97ad5760ddecd
tree89c4d2628f7d8acea2e7c315097bb4488a7e8070
parent80f15dc703b3677d0b025bafd215f1f3664c8978
[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>
arch/powerpc/kernel/cputable.c
arch/powerpc/oprofile/common.c
include/asm-powerpc/cputable.h