From patchwork Mon Apr 2 19:29:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 150238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id C12F5B6EEB for ; Tue, 3 Apr 2012 05:29:48 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEmwf-0007Ae-6t; Mon, 02 Apr 2012 19:29:41 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEmwc-00078f-MJ for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 19:29:38 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SEmwc-0001aJ-Ie for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 19:29:38 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/7] UBUNTU: [Config] Sync sensors wrt master Date: Mon, 2 Apr 2012 21:29:30 +0200 Message-Id: <1333394973-14387-6-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1333394973-14387-1-git-send-email-paolo.pisati@canonical.com> References: <1333394973-14387-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Paolo Pisati --- debian.ti-omap4/config/config.common.ubuntu | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index c17da9d..2dd3662 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -2895,7 +2895,7 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" CONFIG_SECURITY_YAMA=y # CONFIG_SEEQ8005 is not set CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_SENSORS_AD7314 is not set +CONFIG_SENSORS_AD7314=m CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADCXX=m @@ -2938,7 +2938,7 @@ CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m -# CONFIG_SENSORS_LINEAGE is not set +CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3_SPI=m @@ -2956,7 +2956,7 @@ CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_LM93=m CONFIG_SENSORS_LM95241=m -# CONFIG_SENSORS_LM95245 is not set +CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m @@ -2964,18 +2964,18 @@ CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m -# CONFIG_SENSORS_MAX1668 is not set -# CONFIG_SENSORS_MAX6639 is not set -# CONFIG_SENSORS_MAX6642 is not set +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MC13783_ADC=m -# CONFIG_SENSORS_NTC_THERMISTOR is not set +CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_OMAP_TEMP_SENSOR=y CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_SCH5627=m -# CONFIG_SENSORS_SCH5636 is not set +CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m @@ -2989,7 +2989,7 @@ CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m CONFIG_SENSORS_TSL2550=m CONFIG_SENSORS_TSL2563=m -# CONFIG_SENSORS_TWL4030_MADC is not set +CONFIG_SENSORS_TWL4030_MADC=m CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_W83627HF=m @@ -3001,8 +3001,8 @@ CONFIG_SENSORS_W83795=m # CONFIG_SENSORS_W83795_FANCTRL is not set CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m -# CONFIG_SENSORS_WM831X is not set -# CONFIG_SENSORS_WM8350 is not set +CONFIG_SENSORS_WM831X=m +CONFIG_SENSORS_WM8350=m # CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m