← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to target-sh4/machine.c

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
target-sh4/machine.c
1
 
#include "hw/hw.h"
2
 
#include "hw/boards.h"
3
 
 
4
 
void register_machines(void)
5
 
{
6
 
    qemu_register_machine(&shix_machine);
7
 
    qemu_register_machine(&r2d_machine);
8
 
}