From patchwork Mon Nov 19 16:59:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 200049 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8E0A42C00A5 for ; Tue, 20 Nov 2012 04:02:56 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaUhI-0006kX-C1; Mon, 19 Nov 2012 16:59:48 +0000 Received: from eusmtp01.atmel.com ([212.144.249.242]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TaUge-0006Mf-IZ for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 16:59:10 +0000 Received: from HNOCHT02.corp.atmel.com (10.161.30.162) by eusmtp01.atmel.com (10.161.101.30) with Microsoft SMTP Server (TLS) id 14.2.318.4; Mon, 19 Nov 2012 17:59:02 +0100 Received: from [10.159.245.112] (10.161.30.18) by HNOCHT02.corp.atmel.com (10.161.30.162) with Microsoft SMTP Server (TLS) id 14.2.318.1; Mon, 19 Nov 2012 17:59:04 +0100 Message-ID: <50AA6558.1060302@atmel.com> Date: Mon, 19 Nov 2012 17:59:04 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Arnd Bergmann , Olof Johansson , linux-arm-kernel , Linux Kernel list Subject: [GIT PULL] at91: header fix for 3.8 X-Enigmail-Version: 1.4.5 X-Originating-IP: [10.161.30.18] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121119_115909_766168_D2E01951 X-CRM114-Status: UNSURE ( 8.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Joachim Eastwood , Ludovic Desroches , Jean-Christophe PLAGNIOL-VILLARD X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Arnd, Olof, A little fix that goes on top of the modification of headers made by Jean-Christophe. Obviously, I have placed this one on top of your current at91/header branch. The following changes since commit 75984df05d86956541795f01e62d7dc67bc522fd: arm: at91: move at91rm9200 rtc header in drivers/rtc (2012-11-06 20:30:52 +0800) are available in the git repository at: git://github.com/at91linux/linux-at91.git tags/at91-header for you to fetch changes up to 2abb74eaf6e73cb42e87bdc9e9c2535ce485e614: atmel: move ATMEL_MAX_UART to platform_data/atmel.h (2012-11-19 17:44:54 +0100) ---------------------------------------------------------------- One fix related to UART for the "headers move" branch ---------------------------------------------------------------- Jean-Christophe PLAGNIOL-VILLARD (1): atmel: move ATMEL_MAX_UART to platform_data/atmel.h arch/arm/mach-at91/include/mach/hardware.h | 3 --- arch/avr32/mach-at32ap/include/mach/board.h | 1 - include/linux/platform_data/atmel.h | 6 ++++++ 3 files changed, 6 insertions(+), 4 deletions(-) Thanks, best regards,