From patchwork Fri Mar 7 02:44:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 327753 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F02FA2C0086 for ; Fri, 7 Mar 2014 13:46:07 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLkmi-0006w5-LO; Fri, 07 Mar 2014 02:45:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLkmb-0004GF-Q4; Fri, 07 Mar 2014 02:45:09 +0000 Received: from avon.wwwdotorg.org ([70.85.31.133]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLkmP-0004DZ-5R; Fri, 07 Mar 2014 02:44:57 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 9FA031E00C; Thu, 6 Mar 2014 19:44:34 -0700 (MST) Received: from dart.wwwdotorg.org (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 513F5E40E6; Thu, 6 Mar 2014 19:44:33 -0700 (MST) From: Stephen Warren To: arm@kernel.org Subject: [GIT PULL 1/2] ARM: bcm2835: consolidate into mach-bcm/ Date: Thu, 6 Mar 2014 19:44:09 -0700 Message-Id: <1394160250-3939-1-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.8.3.2 X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.97.8 at avon.wwwdotorg.org X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140306_214457_276676_C0F7B740 X-CRM114-Status: UNSURE ( 9.18 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stephen Warren X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org This pull request consists of a single patch which moves files from arch/arm/mach-bcm2835 into mach-bcm, thus consolidating them with support for other Broadcom chips. ---------------------------------------------------------------- The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72: Linus 3.14-rc1 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.15-soc for you to fetch changes up to d30fe6272183f3cc8b9f3f111cd36271332e4cec: ARM: bcm2835: Move to mach-bcm directory ---------------------------------------------------------------- Markus Mayer (1): ARM: bcm2835: Move to mach-bcm directory MAINTAINERS | 2 +- arch/arm/Kconfig | 2 -- arch/arm/Makefile | 1 - arch/arm/configs/bcm2835_defconfig | 1 + arch/arm/mach-bcm/Kconfig | 16 ++++++++++++++++ arch/arm/mach-bcm/Makefile | 2 ++ .../bcm2835.c => mach-bcm/board_bcm2835.c} | 0 arch/arm/mach-bcm2835/Kconfig | 15 --------------- arch/arm/mach-bcm2835/Makefile | 1 - 9 files changed, 20 insertions(+), 20 deletions(-) rename arch/arm/{mach-bcm2835/bcm2835.c => mach-bcm/board_bcm2835.c} (100%) delete mode 100644 arch/arm/mach-bcm2835/Kconfig delete mode 100644 arch/arm/mach-bcm2835/Makefile