Linux-sh Archive on lore.kernel.org
 help / color / Atom feed
From: Shin-ichiro KAWASAKI <kawasaki@juno.dti.ne.jp>
To: linux-sh@vger.kernel.org
Subject: [PATCH] qemu-sh : pci nic interface modified
Date: Sun, 01 Feb 2009 07:58:45 +0000
Message-ID: <49855635.1090108@juno.dti.ne.jp> (raw)

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)

                 reply index

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49855635.1090108@juno.dti.ne.jp \
    --to=kawasaki@juno.dti.ne.jp \
    --cc=linux-sh@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-sh Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-sh/0 linux-sh/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-sh linux-sh/ https://lore.kernel.org/linux-sh \
		linux-sh@vger.kernel.org
	public-inbox-index linux-sh

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-sh


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git