← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to hw/sh_pci.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:
hw/sh_pci.c
174
174
    int mem, reg, iop;
175
175
 
176
176
    p = qemu_mallocz(sizeof(SHPCIC));
177
 
    p->bus = pci_register_bus(set_irq, map_irq, pic, devfn_min, nirq);
 
177
    p->bus = pci_register_bus(NULL, "pci",
 
178
                              set_irq, map_irq, pic, devfn_min, nirq);
178
179
 
179
180
    p->dev = pci_register_device(p->bus, "SH PCIC", sizeof(PCIDevice),
180
181
                                 -1, NULL, NULL);