Return-Path: <sfr@canb.auug.org.au>
Received: from localhost (bix [127.0.0.1])
	by localhost.localdomain (8.12.10/8.12.10) with ESMTP id i8M7iQGe005889
	for <akpm@localhost>; Wed, 22 Sep 2004 00:44:26 -0700
Received: from bix [127.0.0.1]
	by localhost with POP3 (fetchmail-6.2.0)
	for akpm@localhost (single-drop); Wed, 22 Sep 2004 00:44:26 -0700 (PDT)
Received: from fire-1.osdl.org (fire.osdl.org [65.172.181.4])
	by mail.osdl.org (8.11.6/8.11.6) with ESMTP id i8M7fPv26002
	for <akpm@mail.gateway.osdl.net>; Wed, 22 Sep 2004 00:41:25 -0700
Received: from smtps.tip.net.au (chilli.pcug.org.au [203.10.76.44])
	by fire-1.osdl.org (8.12.8/8.12.8) with ESMTP id i8M7fNSe018355
	for <akpm@osdl.org>; Wed, 22 Sep 2004 00:41:24 -0700
Received: from oak (bh02i525f01.au.ibm.com [202.81.18.30])
	by smtps.tip.net.au (Postfix) with ESMTP id 2C47A36800C;
	Wed, 22 Sep 2004 17:41:15 +1000 (EST)
Date: Wed, 22 Sep 2004 17:41:10 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@osdl.org>
Cc: boutcher@us.ibm.com, LKML <linux-kernel@vger.kernel.org>,
        linuxppc64-dev@lists.linuxppc.org
Subject: [PATCH] PPC64 iSeries: allow ibmvscsic to initialise
Message-Id: <20040922174110.6b79a6f2.sfr@canb.auug.org.au>
X-Mailer: Sylpheed version 0.9.12 (GTK+ 1.2.10; i386-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="pgp-sha1";
 boundary="Signature=_Wed__22_Sep_2004_17_41_10_+1000_yrgddrIeVcm4YAz3"
X-MIMEDefang-Filter: osdl$Revision: 1.1 $
X-Scanned-By: MIMEDefang 2.36
X-Spam-Status: No, hits=-4.9 required=1.0 tests=BAYES_00 autolearn=ham 
	version=2.60
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on bix

--Signature=_Wed__22_Sep_2004_17_41_10_+1000_yrgddrIeVcm4YAz3
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Hi Andrew,

This patch supplies an device so that ibmvscsic will actually have
its probe routine called and so allow ti to actually initialise on
(legacy) iSeries machines.

It also adds a device for the virtual console (for consistency only
at the moment).

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff -ruN 2.6.9-rc2-bk7/arch/ppc64/kernel/vio.c 2.6.9-rc2-bk7-vio.1/arch/ppc64/kernel/vio.c
--- 2.6.9-rc2-bk7/arch/ppc64/kernel/vio.c	2004-08-19 17:02:00.000000000 +1000
+++ 2.6.9-rc2-bk7-vio.1/arch/ppc64/kernel/vio.c	2004-09-22 17:14:32.000000000 +1000
@@ -225,6 +225,10 @@
 	struct vio_dev *viodev;
 	int i;
 
+	/* there is only one of each of these */
+	vio_register_device_iseries("viocons", 0);
+	vio_register_device_iseries("vscsi", 0);
+
 	vlan_map = HvLpConfig_getVirtualLanIndexMap();
 	for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) {
 		if ((vlan_map & (0x8000 >> i)) == 0)

--Signature=_Wed__22_Sep_2004_17_41_10_+1000_yrgddrIeVcm4YAz3
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFBUSyW4CJfqux9a+8RAkc3AJ0eUGWImfIbrdAUMICp5dayJK6gjgCbBmF1
PPrzlyPyH2ZpUx/AiuAiOYA=
=ORcU
-----END PGP SIGNATURE-----

--Signature=_Wed__22_Sep_2004_17_41_10_+1000_yrgddrIeVcm4YAz3--
