qemu-sh : pci nic interface modified
diff mbox

Message ID 49855635.1090108@juno.dti.ne.jp
State Accepted
Delegated to: Paul Mundt
Headers show

Commit Message

Shin-ichiro KAWASAKI Feb. 1, 2009, 7:58 a.m. UTC
QEMU revision 6287 modifies pci nic interface. As a result,
'sh4-r2d-update-pci-usb-and-kernel-management.patch' does not apply
smoothly.  This patch solves it.


Signed-off-by: Shin-ichiro KAWASAKI <kawasaki@juno.dti.ne.jp> 

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/staging/sh4-r2d-update-pci-usb-and-kernel-management.patch b/staging/sh4-r2d-update-pci-usb-and-kernel-management.patch
index 6ff42e0..9017909 100644
--- a/staging/sh4-r2d-update-pci-usb-and-kernel-management.patch
+++ b/staging/sh4-r2d-update-pci-usb-and-kernel-management.patch
@@ -28,11 +28,11 @@  Index: qemu/hw/r2d.c
 +    pci = sh_pci_register_bus(r2d_pci_set_irq, r2d_pci_map_irq, irq, 0, 4);
  
      /* NIC: rtl8139 on-board, and 2 slots. */
--    pci_rtl8139_init(pci, &nd_table[0], 2 << 3);
+-    pci_nic_init(pci, &nd_table[0], 2 << 3, "rtl8139");
 +    if (nb_nics)
-+        pci_rtl8139_init(pci, &nd_table[0], 2 << 3);
++        pci_nic_init(pci, &nd_table[0], 2 << 3, "rtl8139");
      for (i = 1; i < nb_nics; i++)
-         pci_nic_init(pci, &nd_table[i], -1);
+         pci_nic_init(pci, &nd_table[i], -1, "ne2k_pci");
  
 +    /* USB OHCI for keyboard & mouse */
 +    if (usb_enabled)