From patchwork Fri Mar 30 23:20:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 149798 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 E52BEB6FA2 for ; Sat, 31 Mar 2012 10:24:36 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SDl7Q-0000Os-Vd; Fri, 30 Mar 2012 23:20:33 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SDl7M-0000Oe-OC for linux-arm-kernel@lists.infradead.org; Fri, 30 Mar 2012 23:20:29 +0000 Received: by wgbdr1 with SMTP id dr1so646407wgb.18 for ; Fri, 30 Mar 2012 16:20:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:date:message-id:subject:from:to:cc :content-type:x-gm-message-state; bh=VXCr8r3xnrp/VeWAvYUQDRMwPpWJhxrA1l44X9eh2Do=; b=Ow0ef8SuWQKfbcdrONVQ219l8hiDXK7f8t3CnJ5tZ6uQHEJBKWwvgfMbYMyE7yvbjd ERGmJ/UqJPJ1wDxy3jR435+C4BGrwXu8UKaITTGMBICquV7lbRM6i7qQpRLVvwD398OY 9kaujeic4gCOb+C0oO9mk+RUSCa5AUPt9O+agFLIBft3g2ca2VNHfMA+xuLotuDpFBba 9E9Rlq8ndC+X912TQqMA18hiY68RaDf2A88fEWGYxqDjmbuQEKJnroWR85yhlTq29DYY nuB23PoDaaD7WozALsaPi7vuqTiXpnocOCcMxcuzZs1wt+vYfMJbC9tHuVOtigGN32k+ 0Q0A== MIME-Version: 1.0 Received: by 10.180.100.2 with SMTP id eu2mr995623wib.1.1333149625477; Fri, 30 Mar 2012 16:20:25 -0700 (PDT) Received: by 10.227.60.21 with HTTP; Fri, 30 Mar 2012 16:20:25 -0700 (PDT) X-Originating-IP: [173.13.129.225] Date: Fri, 30 Mar 2012 16:20:25 -0700 Message-ID: Subject: [GIT PULL] ARM: Two more fixes for merge window fallout From: Olof Johansson To: Linus Torvalds X-Gm-Message-State: ALoCoQmZAtLZ8WadM1kx9PxgJzdZhfC2PeuSqZH1UR2gpsRP1rRe6ElWEoF7I10iHJPs4IQjnn70 X-Spam-Note: CRM114 invocation failed 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.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Linus, Apologies for back-to-back fixes pull requests, but one of the patches below are the kind we'll see posted over and over if we don't send it in. I hadn't done the full sanity-check of defconfig builds by the time I sent up the other fixes yesterday or I would have included it then. After this we're likely to switch to a more regular frequency of sending fixes up. Thanks, -Olof The following changes since commit f00e9b11863abdb837e555a2b1e3417e8b5d80dd: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes (2012-03-29 20:36:18 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes for you to fetch changes up to d3c7de52096a201ac188adb95b8351b90cab11f1: ARM: clps711x: fix missing include file (2012-03-30 15:44:48 -0700) ---------------------------------------------------------------- ARM: A few more platform fixes for include file fallout Two patches, one dealing with the system.h fallout, the other is a missing linux/bug.h in a place where ARRAY_SIZE() is used. ---------------------------------------------------------------- Olof Johansson (2): ARM: fix builds due to missing includes ARM: clps711x: fix missing include file arch/arm/mach-at91/at91x40.c | 1 + arch/arm/mach-at91/setup.c | 1 + arch/arm/mach-clps711x/edb7211-mm.c | 1 + arch/arm/mach-h720x/common.c | 1 + arch/arm/mach-imx/mm-imx3.c | 1 + arch/arm/mach-imx/mm-imx5.c | 1 + arch/arm/mach-ixp23xx/core.c | 1 + arch/arm/mach-ixp4xx/common.c | 1 + arch/arm/mach-pxa/raumfeld.c | 2 ++ arch/arm/mach-shark/core.c | 1 + arch/arm/mach-w90x900/dev.c | 1 + arch/arm/plat-s3c24xx/cpu.c | 1 + 12 files changed, 13 insertions(+)