* [PATCH] qemu-sh : pci nic interface modified
@ 2009-02-01 7:58 Shin-ichiro KAWASAKI
0 siblings, 0 replies; only message in thread
From: Shin-ichiro KAWASAKI @ 2009-02-01 7:58 UTC (permalink / raw)
To: linux-sh
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>
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)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-02-01 7:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-01 7:58 [PATCH] qemu-sh : pci nic interface modified Shin-ichiro KAWASAKI
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox