From patchwork Mon Feb 15 17:37:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 79435 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1FHcINi013010 for ; Mon, 15 Feb 2010 17:38:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755799Ab0BORiR (ORCPT ); Mon, 15 Feb 2010 12:38:17 -0500 Received: from mail-in-08.arcor-online.net ([151.189.21.48]:38188 "EHLO mail-in-08.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755779Ab0BORiQ (ORCPT ); Mon, 15 Feb 2010 12:38:16 -0500 Received: from mail-in-05-z2.arcor-online.net (mail-in-05-z2.arcor-online.net [151.189.8.17]) by mx.arcor.de (Postfix) with ESMTP id EBD872AEF3A; Mon, 15 Feb 2010 18:38:15 +0100 (CET) Received: from mail-in-14.arcor-online.net (mail-in-14.arcor-online.net [151.189.21.54]) by mail-in-05-z2.arcor-online.net (Postfix) with ESMTP id DCBD32DB63B; Mon, 15 Feb 2010 18:38:15 +0100 (CET) Received: from localhost.localdomain (dslb-188-103-172-103.pools.arcor-ip.net [188.103.172.103]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-14.arcor-online.net (Postfix) with ESMTPA id 8661528B0CD; Mon, 15 Feb 2010 18:38:15 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-14.arcor-online.net 8661528B0CD DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1266255495; bh=AUXt1mYPbwnAm5/MtAEgp11fyrhdaCmIjFI7ScBQzyE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=tiLFkjr30oSxZI8vMaAQeu7/njfVVzQuK0peyVqUdhE/WzCVTAhS23JhkTewMuQZl 568aPB4gbBOa8+q/IhhdTWOBM3rKbwioQEMtGt8g0ei4wqe2NTc3bLMypX/w29pbN3 7RGQOg823PLMCnza9p1IHWxKq3uvg/YUzeEfqiwo= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, dheitmueller@kernellabs.com, Stefan Ringel Subject: [PATCH 02/11] tm6000: add i2c bus id for tm6000 Date: Mon, 15 Feb 2010 18:37:15 +0100 Message-Id: <1266255444-7422-2-git-send-email-stefan.ringel@arcor.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1266255444-7422-1-git-send-email-stefan.ringel@arcor.de> References: <1266255444-7422-1-git-send-email-stefan.ringel@arcor.de> 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.3 (demeter.kernel.org [140.211.167.41]); Mon, 15 Feb 2010 17:38:18 +0000 (UTC) diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c index 05df06b..6b17d0b 100644 --- a/drivers/staging/tm6000/tm6000-i2c.c +++ b/drivers/staging/tm6000/tm6000-i2c.c @@ -32,8 +32,6 @@ #include "tuner-xc2028.h" -/*FIXME: Hack to avoid needing to patch i2c-id.h */ -#define I2C_HW_B_TM6000 I2C_HW_B_EM28XX /* ----------------------------------------------------------- */ static unsigned int i2c_debug = 0; diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index e844a0b..09e3a4e 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h @@ -42,6 +42,7 @@ #define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ #define I2C_HW_B_CX231XX 0x010024 /* Conexant CX231XX USB based cards */ #define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */ +#define I2C_HW_B_TM6000 0x010026 /* TM5600/TM6000/TM6010 media bridge */ /* --- SGI adapters */ #define I2C_HW_SGI_VINO 0x160000