diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-02-06 22:08:37 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-02-06 22:08:37 +1100 |
| commit | b370b08274a25cf1e2015fb7ce65c43173c8156f (patch) | |
| tree | 0c8f990148da4ca1275ac5471c93c519754f4aec /include/asm-powerpc/cputable.h | |
| parent | 75e89b02e338d0db27f8e5d66642c7e2ae49c326 (diff) | |
| parent | 7e25867fe8d705bcf707ef52004b669eb795d06d (diff) | |
| download | talos-op-linux-b370b08274a25cf1e2015fb7ce65c43173c8156f.tar.gz talos-op-linux-b370b08274a25cf1e2015fb7ce65c43173c8156f.zip | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'include/asm-powerpc/cputable.h')
| -rw-r--r-- | include/asm-powerpc/cputable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 528ef183c221..1e79673b7316 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h @@ -46,7 +46,7 @@ enum powerpc_oprofile_type { PPC_OPROFILE_RS64 = 1, PPC_OPROFILE_POWER4 = 2, PPC_OPROFILE_G4 = 3, - PPC_OPROFILE_BOOKE = 4, + PPC_OPROFILE_FSL_EMB = 4, PPC_OPROFILE_CELL = 5, PPC_OPROFILE_PA6T = 6, }; |
