diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-12 08:08:12 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-12 08:08:12 -0500 |
| commit | 711c21280b2cb56060859cc574221a8bf40f908a (patch) | |
| tree | 9f5385c53ac50e613ae34d4165d02460ef993f0f /target-ppc | |
| parent | 89bb563f6912b3f538d6bdf5833881ed7cdbd923 (diff) | |
| parent | 2f172849b63b166fe876aa97b411f63ee7d17467 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts:
cpu-all.h
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/cpu.h | 2 | ||||
| -rw-r--r-- | target-ppc/translate_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 04b12590fa..e438b17cb2 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -225,7 +225,7 @@ enum { /* 970FX specific exceptions */ POWERPC_EXCP_SOFTP = 88, /* Soft patch exception */ POWERPC_EXCP_MAINT = 89, /* Maintenance exception */ - /* Freescale embeded cores specific exceptions */ + /* Freescale embedded cores specific exceptions */ POWERPC_EXCP_MEXTBR = 90, /* Maskable external breakpoint */ POWERPC_EXCP_NMEXTBR = 91, /* Non maskable external breakpoint */ POWERPC_EXCP_ITLBE = 92, /* Instruction TLB error */ diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index e2a83c5a38..ed291c36b2 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9049,7 +9049,7 @@ static const ppc_def_t ppc_defs[] = { }; /*****************************************************************************/ -/* Generic CPU instanciation routine */ +/* Generic CPU instantiation routine */ static void init_ppc_proc (CPUPPCState *env, const ppc_def_t *def) { #if !defined(CONFIG_USER_ONLY) |