From patchwork Wed Sep 15 11:50:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 64798 X-Patchwork-Delegate: tim.gardner@canonical.com 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 49FD1B6F01 for ; Wed, 15 Sep 2010 21:50:43 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OvqVU-0001Rr-5Z; Wed, 15 Sep 2010 12:50:32 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OvqVL-0001Po-1i for kernel-team@lists.ubuntu.com; Wed, 15 Sep 2010 12:50:23 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OvqVK-0002X5-Uy for ; Wed, 15 Sep 2010 12:50:22 +0100 Received: from cpc2-aztw21-0-0-cust264.aztw.cable.virginmedia.com ([77.100.97.9] helo=[192.168.0.2]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OvqVK-0000kp-RW for kernel-team@lists.ubuntu.com; Wed, 15 Sep 2010 12:50:22 +0100 Message-ID: <4C90B2FE.4060005@canonical.com> Date: Wed, 15 Sep 2010 12:50:22 +0100 From: Lee Jones User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.12) Gecko/20100826 Thunderbird/3.0.7 MIME-Version: 1.0 To: kernel-team Subject: [Maverick][Pull request] UBUNTU: [Config] Enable CONFIG_HIGH_RES_TIMERS=y - ti-omap4 X-Enigmail-Version: 1.0.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com ALSA needs high resolution timers for timer-based scheduling. The following changes since commit 4fe51dbd044fffa0962dfff88edebf977e82ce34: Tim Gardner (1): UBUNTU: Start new release are available in the git repository at: git://kernel.ubuntu.com/lag/ubuntu-maverick.git lp638754-high-res-timer Lee Jones (1): UBUNTU: [Config] Enable CONFIG_HIGH_RES_TIMERS=y debian.ti-omap4/config/config.common.ubuntu | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index 708b768..8d46b55 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -928,7 +928,7 @@ CONFIG_HID_WACOM=m CONFIG_HID_ZEROPLUS=m # CONFIG_HID_ZYDACRON is not set CONFIG_HIGHMEM=y -# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HIGH_RES_TIMERS=y CONFIG_HOSTAP=m # CONFIG_HOSTAP_FIRMWARE is not set CONFIG_HOTPLUG=y @@ -1274,6 +1274,7 @@ CONFIG_JOYSTICK_STINGER=m CONFIG_JOYSTICK_TMDC=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_TWIDJOY=m +# CONFIG_JOYSTICK_WALKERA0701 is not set CONFIG_JOYSTICK_WARRIOR=m CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y @@ -2350,6 +2351,7 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_DUMMY is not set CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_EMU10K1_SEQ is not set +# CONFIG_SND_HRTIMER is not set CONFIG_SND_HWDEP=m CONFIG_SND_JACK=y CONFIG_SND_MIXER_OSS=m @@ -2556,6 +2558,7 @@ CONFIG_THERMAL=m CONFIG_THERMAL_HWMON=y CONFIG_THRUSTMASTER_FF=y # CONFIG_THUMB2_KERNEL is not set +CONFIG_TICK_ONESHOT=y CONFIG_TILER_OMAP=y # CONFIG_TIMB_DMA is not set CONFIG_TIMERFD=y