From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756848AbcGIRzF (ORCPT ); Sat, 9 Jul 2016 13:55:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57096 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752076AbcGIRzB (ORCPT ); Sat, 9 Jul 2016 13:55:01 -0400 Date: Sat, 9 Jul 2016 10:54:32 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: tglx@linutronix.de, torvalds@linux-foundation.org, andriy.shevchenko@linux.intel.com, mingo@kernel.org, hpa@zytor.com, peterz@infradead.org, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, torvalds@linux-foundation.org, mingo@kernel.org, andriy.shevchenko@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, peterz@infradead.org In-Reply-To: <1466265094-146113-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1466265094-146113-1-git-send-email-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/intel-mid: Rename mrfl.c to mrfld.c Git-Commit-ID: 62d855d3e725f4e4b0d2786f7cad3f0660a03a59 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 62d855d3e725f4e4b0d2786f7cad3f0660a03a59 Gitweb: http://git.kernel.org/tip/62d855d3e725f4e4b0d2786f7cad3f0660a03a59 Author: Andy Shevchenko AuthorDate: Sat, 18 Jun 2016 18:51:34 +0300 Committer: Ingo Molnar CommitDate: Sat, 9 Jul 2016 14:02:09 +0200 x86/platform/intel-mid: Rename mrfl.c to mrfld.c Use mrfld as an abbreviation of Merrifield to be consistent with the rest of the code. In the future we are going to add more files here prefixed with 'mrfld'. Signed-off-by: Andy Shevchenko Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1466265094-146113-1-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/platform/intel-mid/Makefile | 2 +- arch/x86/platform/intel-mid/{mrfl.c => mrfld.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/intel-mid/Makefile b/arch/x86/platform/intel-mid/Makefile index aebb5b9..fa021df 100644 --- a/arch/x86/platform/intel-mid/Makefile +++ b/arch/x86/platform/intel-mid/Makefile @@ -1,4 +1,4 @@ -obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o mfld.o mrfl.o pwr.o +obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o mfld.o mrfld.o pwr.o # SFI specific code ifdef CONFIG_X86_INTEL_MID diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfld.c similarity index 97% rename from arch/x86/platform/intel-mid/mrfl.c rename to arch/x86/platform/intel-mid/mrfld.c index bd1adc6..59253db 100644 --- a/arch/x86/platform/intel-mid/mrfl.c +++ b/arch/x86/platform/intel-mid/mrfld.c @@ -1,5 +1,5 @@ /* - * mrfl.c: Intel Merrifield platform specific setup code + * Intel Merrifield platform specific setup code * * (C) Copyright 2013 Intel Corporation *