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 /hw/ppc4xx_devs.c | |
| parent | 89bb563f6912b3f538d6bdf5833881ed7cdbd923 (diff) | |
| parent | 2f172849b63b166fe876aa97b411f63ee7d17467 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts:
cpu-all.h
Diffstat (limited to 'hw/ppc4xx_devs.c')
| -rw-r--r-- | hw/ppc4xx_devs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index 7f9ed17138..68bdfaacc7 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -38,7 +38,7 @@ #endif /*****************************************************************************/ -/* Generic PowerPC 4xx processor instanciation */ +/* Generic PowerPC 4xx processor instantiation */ CPUState *ppc4xx_init (const char *cpu_model, clk_setup_t *cpu_clk, clk_setup_t *tb_clk, uint32_t sysclk) |