From patchwork Fri Jan 13 16:27:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 135918 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 44786B6F71 for ; Sat, 14 Jan 2012 03:27:45 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RljyW-0002qg-R7; Fri, 13 Jan 2012 16:27:32 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RljyU-0002qD-DI for kernel-team@lists.ubuntu.com; Fri, 13 Jan 2012 16:27:30 +0000 Received: from business-89-133-214-90.business.broadband.hu ([89.133.214.90] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RljyU-0000VX-9t for kernel-team@lists.ubuntu.com; Fri, 13 Jan 2012 16:27:30 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] Revert "UBUNTU: [Config] PL310_ERRATA_769419=y" Date: Fri, 13 Jan 2012 17:27:28 +0100 Message-Id: <1326472048-2303-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1326472048-2303-1-git-send-email-paolo.pisati@canonical.com> References: <1326472048-2303-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 This reverts commit 2c1fc84ac4e655ee39b8cbe6a5ca553ac1e81de6. Signed-off-by: Paolo Pisati --- debian.ti-omap4/config/config.common.ubuntu | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index 4ac1126..b221ecc 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -2501,7 +2501,7 @@ CONFIG_PID_NS=y CONFIG_PL310_ERRATA_588369=y CONFIG_PL310_ERRATA_727915=y # CONFIG_PL310_ERRATA_753970 is not set -CONFIG_PL310_ERRATA_769419=y +# CONFIG_PL310_ERRATA_769419 is not set # CONFIG_PLAT_SPEAR is not set CONFIG_PLIP=m CONFIG_PM=y @@ -3499,6 +3499,7 @@ CONFIG_USB_GADGETFS=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GL860=m @@ -3588,7 +3589,10 @@ CONFIG_USB_MIDI_GADGET=m CONFIG_USB_MON=y CONFIG_USB_MOUSE=m CONFIG_USB_MR800=m +# CONFIG_USB_MUSB_AM35X is not set # CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_MUSB_OMAP2PLUS is not set +# CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_NET2272 is not set CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m