From patchwork Sun Jul 3 21:25:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Endriss X-Patchwork-Id: 941122 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p63LSMcY018657 for ; Sun, 3 Jul 2011 21:28:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756605Ab1GCV2T (ORCPT ); Sun, 3 Jul 2011 17:28:19 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:56312 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751329Ab1GCV2P (ORCPT ); Sun, 3 Jul 2011 17:28:15 -0400 Received: (qmail invoked by alias); 03 Jul 2011 21:28:14 -0000 Received: from unknown (HELO charon.escape-edv.de) [93.216.248.100] by mail.gmx.net (mp066) with SMTP; 03 Jul 2011 23:28:14 +0200 X-Authenticated: #476490 X-Provags-ID: V01U2FsdGVkX1/e+vUyJY7eFoA4Qc3vC3hFYU1KOOkbBQY7zQkJNk KHxlbNHhh0Etne Received: from orion.escape-edv.de (192.168.1.10) by charon.escape-edv.de (192.168.1.9) with esmtp ; Sun, 03 Jul 2011 23:28:13 +0200 From: Oliver Endriss Organization: ESCAPE GmbH EDV-Loesungen To: linux-media@vger.kernel.org Subject: [PATCH 3/5] ddbridge: Allow compiling of the driver Date: Sun, 3 Jul 2011 23:25:29 +0200 User-Agent: KMail/1.9.6 Cc: Mauro Carvalho Chehab References: <201107032321.46092@orion.escape-edv.de> In-Reply-To: <201107032321.46092@orion.escape-edv.de> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201107032325.30206@orion.escape-edv.de> X-Y-GMX-Trusted: 0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 03 Jul 2011 21:28:22 +0000 (UTC) Driver added to Makefile and Kconfig. Signed-off-by: Oliver Endriss --- drivers/media/dvb/Kconfig | 4 ++++ drivers/media/dvb/Makefile | 3 ++- drivers/media/dvb/ddbridge/Kconfig | 18 ++++++++++++++++++ drivers/media/dvb/ddbridge/Makefile | 14 ++++++++++++++ 4 files changed, 38 insertions(+), 1 deletions(-) create mode 100644 drivers/media/dvb/ddbridge/Kconfig create mode 100644 drivers/media/dvb/ddbridge/Makefile diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig index ee214c3..f6e40b3 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig @@ -80,6 +80,10 @@ comment "Supported nGene Adapters" depends on DVB_CORE && PCI && I2C source "drivers/media/dvb/ngene/Kconfig" +comment "Supported ddbridge ('Octopus') Adapters" + depends on DVB_CORE && PCI && I2C + source "drivers/media/dvb/ddbridge/Kconfig" + comment "Supported DVB Frontends" depends on DVB_CORE source "drivers/media/dvb/frontends/Kconfig" diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile index a1a0875..b2cefe6 100644 --- a/drivers/media/dvb/Makefile +++ b/drivers/media/dvb/Makefile @@ -15,6 +15,7 @@ obj-y := dvb-core/ \ dm1105/ \ pt1/ \ mantis/ \ - ngene/ + ngene/ \ + ddbridge/ obj-$(CONFIG_DVB_FIREDTV) += firewire/ diff --git a/drivers/media/dvb/ddbridge/Kconfig b/drivers/media/dvb/ddbridge/Kconfig new file mode 100644 index 0000000..d099e1a --- /dev/null +++ b/drivers/media/dvb/ddbridge/Kconfig @@ -0,0 +1,18 @@ +config DVB_DDBRIDGE + tristate "Digital Devices bridge support" + depends on DVB_CORE && PCI && I2C + select DVB_LNBP21 if !DVB_FE_CUSTOMISE + select DVB_STV6110x if !DVB_FE_CUSTOMISE + select DVB_STV090x if !DVB_FE_CUSTOMISE + select DVB_DRXK if !DVB_FE_CUSTOMISE + select DVB_TDA18271C2DD if !DVB_FE_CUSTOMISE + ---help--- + Support for cards with the Digital Devices PCI express bridge: + - Octopus PCIe Bridge + - Octopus mini PCIe Bridge + - Octopus LE + - DuoFlex S2 Octopus + - DuoFlex CT Octopus + - cineS2(v6) + + Say Y if you own such a card and want to use it. diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/dvb/ddbridge/Makefile new file mode 100644 index 0000000..de4fe19 --- /dev/null +++ b/drivers/media/dvb/ddbridge/Makefile @@ -0,0 +1,14 @@ +# +# Makefile for the ddbridge device driver +# + +ddbridge-objs := ddbridge-core.o + +obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o + +EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ +EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/ +EXTRA_CFLAGS += -Idrivers/media/common/tuners/ + +# For the staging CI driver cxd2099 +EXTRA_CFLAGS += -Idrivers/staging/cxd2099/