• Andy Whitcroft's avatar
    [PATCH] powerpc: oprofile cpu type names clash with other code · 7a45fb19
    Andy Whitcroft authored
    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: default avatarAndy Whitcroft <apw@shadowen.org>
    Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
    7a45fb19
cputable.c 29.8 KB