From patchwork Sun Feb 1 07:58:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin-ichiro KAWASAKI X-Patchwork-Id: 4958 X-Patchwork-Delegate: lethal@linux-sh.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n117wgwh014791 for ; Sun, 1 Feb 2009 07:58:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751432AbZBAH6m (ORCPT ); Sun, 1 Feb 2009 02:58:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751440AbZBAH6m (ORCPT ); Sun, 1 Feb 2009 02:58:42 -0500 Received: from vsmtp04.dti.ne.jp ([202.216.231.139]:55634 "EHLO vsmtp04.dti.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751432AbZBAH6l (ORCPT ); Sun, 1 Feb 2009 02:58:41 -0500 Received: from [192.168.1.21] (PPPa1787.e11.eacc.dti.ne.jp [124.255.93.17]) by vsmtp04.dti.ne.jp (3.11v) with ESMTP AUTH id n117wd4m007488 for ; Sun, 1 Feb 2009 16:58:39 +0900 (JST) Message-ID: <49855635.1090108@juno.dti.ne.jp> Date: Sun, 01 Feb 2009 16:58:45 +0900 From: Shin-ichiro KAWASAKI User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: "linux-sh@vger.kernel.org" Subject: [PATCH] qemu-sh : pci nic interface modified Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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 --- 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 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)