Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Tue, 5 May 2009
 17:42:11 -0700
Received: from psmtp.com ([64.18.0.123]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 5 May 2009 17:42:02 -0700
Received: from source ([213.58.128.207]) by exprod5mx237.postini.com
 ([64.18.4.13]) with SMTP;	Tue, 05 May 2009 17:42:01 PDT
Received: from localhost.localdomain ([127.0.0.1]:49052 "EHLO
	ftp.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S20021296AbZEFAhi (ORCPT	<rfc822;andy.sharp@onstor.com>); Wed, 6 May
 2009 01:37:38 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 06 May 2009 01:37:21
 +0100 (BST)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:16893 "EHLO
	mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK)	by ftp.linux-mips.org with
 ESMTP id S20021329AbZEFAg1 (ORCPT	<rfc822;linux-mips@linux-mips.org>); Wed, 6
 May 2009 01:36:27 +0100
Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by
 mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503)	id <B4a00db800006>;
 Tue, 05 May 2009 20:36:16 -0400
Received: from exch4.caveonetworks.com ([192.168.16.23]) by
 exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959);	 Tue, 5 May
 2009 17:35:31 -0700
Received: from dd1.caveonetworks.com ([64.169.86.201]) by
 exch4.caveonetworks.com over TLS secured channel with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 5 May 2009 17:35:31 -0700
Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1])	by
 dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n460ZQ6q022779;	Tue, 5
 May 2009 17:35:26 -0700
Received: (from ddaney@localhost)	by dd1.caveonetworks.com
 (8.14.2/8.14.2/Submit) id n460ZQW2022778;	Tue, 5 May 2009 17:35:26 -0700
From: David Daney <ddaney@caviumnetworks.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>, "gregkh@suse.de"
	<gregkh@suse.de>
CC: David Daney <ddaney@caviumnetworks.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Tue, 5 May 2009 17:35:22 -0700
Subject: [PATCH 7/7] [Staging] Hookup octeon-ethernet driver.
Thread-Topic: [PATCH 7/7] [Staging] Hookup octeon-ethernet driver.
Thread-Index: AcnN434ek1oNFOD5TRuV/AzWlHmwnA==
Message-ID: <1241570122-22728-7-git-send-email-ddaney@caviumnetworks.com>
References: <4A00DA84.5040101@caviumnetworks.com>
In-Reply-To: <4A00DA84.5040101@caviumnetworks.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 06 May 2009 00:35:31.0237 (UTC)
 FILETIME=[8F9AF550:01C9CDE2]
x-ems-stamp: ymokIW6Nbgkgs/uL0dk16A==
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-neptune: 0/0/0.00/0
x-pstn-levels: (S:64.33950/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-list: linux-mips
x-archive-position: 22631
x-ecartis-version: Ecartis v1.0.0
x-original-sender: ddaney@caviumnetworks.com
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

The previous patch adds the driver files for octeon-ethernet.  Here we
hook them up into the main kernel build system.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 drivers/staging/Kconfig  |    2 ++
 drivers/staging/Makefile |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 0dcf9ca..6c2ca23 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -115,5 +115,7 @@ source "drivers/staging/line6/Kconfig"
=20
 source "drivers/staging/serqt_usb/Kconfig"
=20
+source "drivers/staging/octeon/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 47dfd5b..6da9c74 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -40,3 +40,4 @@ obj-$(CONFIG_PLAN9AUTH)		+=3D p9auth/
 obj-$(CONFIG_HECI)		+=3D heci/
 obj-$(CONFIG_LINE6_USB)		+=3D line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH_ESU100)	+=3D serqt_usb/
+obj-$(CONFIG_OCTEON_ETHERNET)	+=3D octeon/
--=20
1.6.0.6


