From patchwork Thu Feb 11 16:22:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 78735 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 o1BGN5cj001426 for ; Thu, 11 Feb 2010 16:23:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756276Ab0BKQXE (ORCPT ); Thu, 11 Feb 2010 11:23:04 -0500 Received: from mail-in-01.arcor-online.net ([151.189.21.41]:35261 "EHLO mail-in-01.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755882Ab0BKQXB (ORCPT ); Thu, 11 Feb 2010 11:23:01 -0500 Received: from mail-in-06-z2.arcor-online.net (mail-in-06-z2.arcor-online.net [151.189.8.18]) by mx.arcor.de (Postfix) with ESMTP id D6AA2332C4F; Thu, 11 Feb 2010 17:22:58 +0100 (CET) Received: from mail-in-11.arcor-online.net (mail-in-11.arcor-online.net [151.189.21.51]) by mail-in-06-z2.arcor-online.net (Postfix) with ESMTP id C8B1C5C0CF; Thu, 11 Feb 2010 17:22:58 +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-11.arcor-online.net (Postfix) with ESMTPA id 273C9E4152; Thu, 11 Feb 2010 17:22:58 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-11.arcor-online.net 273C9E4152 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1265905378; bh=nEwaHInjSpgemqLnNR69Jn/RD/sfggpG+DINySQZGZQ=; h=From:To:Cc:Subject:Date:Message-Id; b=LOPqx7ZcxCW87Z8j7S9o18/B2u5OgeLbhfnUoPGD7kY1pOwmLTpeiR3HJjV7KKtIK a3ab8IbfmGLDNzT6MxcJu7SvLVTGeIrrPIadSixgTRjeU1p5KXPLEn9Qt7Sph5W6wu PY35ZuWpsg5vOjQw6nD4zG8/RryOODi26aBEQvlw= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, dheitmueller@kernellabs.com, Stefan Ringel Subject: [PATCH] tm6000: add i2c bus id for tm6000 Date: Thu, 11 Feb 2010 17:22:07 +0100 Message-Id: <1265905327-6172-1-git-send-email-stefan.ringel@arcor.de> X-Mailer: git-send-email 1.6.6.1 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]); Thu, 11 Feb 2010 16:23:09 +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