Message ID | 1462178783-29294-3-git-send-email-geert@linux-m68k.org |
---|---|
State | Accepted |
Headers | show
Return-Path: <rtc-linux+bncBCQJP74GSUDRB75LTS4QKGQEA6UZV7Q@googlegroups.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wm0-x23f.google.com (mail-wm0-x23f.google.com [IPv6:2a00:1450:400c:c09::23f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qyynG5gzxz9t3x for <incoming@patchwork.ozlabs.org>; Mon, 2 May 2016 18:55:30 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b=lOI3v6BW; dkim-atps=neutral Received: by mail-wm0-x23f.google.com with SMTP id r12sf35441454wme.0 for <incoming@patchwork.ozlabs.org>; Mon, 02 May 2016 01:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:precedence:mailing-list:list-id:x-spam-checked-in-group :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=ocpL+VAzgXIuIJsyUPipMcq9Q6B302qp3FPhQLgLnnU=; b=lOI3v6BWefwymy2MFivVr6wGwqc//yJUYRvQ6KFvgVYO441wcMxrW7DLCiRdP1oWrq UcgxuE9ZI9e95POnhnd4zUXMvVRVo8KNe/Y/Cq21Q/kh59zyKa7QzPwol0iqb3RlePa1 +ety8aWwj4cjZ8wiVwsEccZv4LhocjzLBN40HUEltHOjoTYEWcxWImeoxFyu3orNJMJ3 CjPZlxAj6draAlQXrzSXHZo8FS1t4dMnCGzN53bLCkaO7/pvxVgM4exzdXKX6ccDvIgW 1VNuoRQFweuND+A7OV2SP+C46wYXJu5VYeNQpLlIW0ZK/W1pj5AM9Yl6lvueATj+pGUH qETg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=ocpL+VAzgXIuIJsyUPipMcq9Q6B302qp3FPhQLgLnnU=; b=WslZLkoEc/ps0t2mzO1xl45nZX+UtFfs6t4gObRZhctwAbKvZXxvdAn/3wTAiGJa2p MiRbcq63JOX6cZZPGXeAXegY5/HDT3PLjLV0FfJyVjk0BmNwDSYgS8nWMHuZRWook8yU 6xRpCzU0+WNN1qhLsv1fMVD004LSp2/NCtsiO/oAhCGHDZbiL60vbWdkDlKnQymw/tjV 9lnuDyNZwBOL4ff1k9ud8I/wes8JpgA8QCnu2up6sj16txiDxcxTnjZayXQjyBy2QInW IAa78fpjxpHyZh/nh8EMH877zxlN4thiXoLREBVhVuueAZPeBheQeVnD4HUQKIdpn7G6 2CiA== Sender: rtc-linux@googlegroups.com X-Gm-Message-State: AOPr4FXu5NAFGiMP/nfHWWg8Pt+UmGFBMUndTBeG/0xWamHGW0QPxejtTE5QVUrlSCLuyA== X-Received: by 10.25.24.194 with SMTP id 63mr546300lfy.20.1462179327590; Mon, 02 May 2016 01:55:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.25.17.166 with SMTP id 38ls509637lfr.81.gmail; Mon, 02 May 2016 01:55:27 -0700 (PDT) X-Received: by 10.112.133.199 with SMTP id pe7mr3674159lbb.13.1462179327105; Mon, 02 May 2016 01:55:27 -0700 (PDT) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be. [2a02:1800:120:4::f00:14]) by gmr-mx.google.com with ESMTPS id t18si457982wmt.0.2016.05.02.01.55.23 for <rtc-linux@googlegroups.com> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 May 2016 01:55:27 -0700 (PDT) Received-SPF: neutral (google.com: 2a02:1800:120:4::f00:14 is neither permitted nor denied by best guess record for domain of geert@linux-m68k.org) client-ip=2a02:1800:120:4::f00:14; Received: from ayla.of.borg ([84.195.107.21]) by xavier.telenet-ops.be with bizsmtp id pLmd1s0240TjorY01LmdeA; Mon, 02 May 2016 10:47:41 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from <geert@linux-m68k.org>) id 1ax9Ut-0002Ib-SA; Mon, 02 May 2016 10:46:31 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from <geert@linux-m68k.org>) id 1ax9Ut-0007dG-RW; Mon, 02 May 2016 10:46:31 +0200 From: Geert Uytterhoeven <geert@linux-m68k.org> To: Arnd Bergmann <arnd@arndb.de>, Alexandre Belloni <alexandre.belloni@free-electrons.com> Cc: a.zummo@towertech.it, rtc-linux@googlegroups.com, linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert@linux-m68k.org> Subject: [rtc-linux] [PATCH 2/2] m68k/mvme16x: Include generic <linux/rtc.h> Date: Mon, 2 May 2016 10:46:23 +0200 Message-Id: <1462178783-29294-3-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462178783-29294-1-git-send-email-geert@linux-m68k.org> References: <1462178783-29294-1-git-send-email-geert@linux-m68k.org> X-Original-Sender: geert@linux-m68k.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2a02:1800:120:4::f00:14 is neither permitted nor denied by best guess record for domain of geert@linux-m68k.org) smtp.mailfrom=geert@linux-m68k.org Reply-To: rtc-linux@googlegroups.com Content-Type: text/plain; charset=UTF-8 Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: <rtc-linux.googlegroups.com> X-Spam-Checked-In-Group: rtc-linux@googlegroups.com X-Google-Group-Id: 712029733259 List-Post: <https://groups.google.com/group/rtc-linux/post>, <mailto:rtc-linux@googlegroups.com> List-Help: <https://groups.google.com/support/>, <mailto:rtc-linux+help@googlegroups.com> List-Archive: <https://groups.google.com/group/rtc-linux List-Subscribe: <https://groups.google.com/group/rtc-linux/subscribe>, <mailto:rtc-linux+subscribe@googlegroups.com> List-Unsubscribe: <mailto:googlegroups-manage+712029733259+unsubscribe@googlegroups.com>, <https://groups.google.com/group/rtc-linux/subscribe> |
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c index 1755e2f7137d89ad..1cdc732681885e9a 100644 --- a/arch/m68k/mvme16x/rtc.c +++ b/arch/m68k/mvme16x/rtc.c @@ -14,7 +14,7 @@ #include <linux/fcntl.h> #include <linux/init.h> #include <linux/poll.h> -#include <linux/mc146818rtc.h> /* For struct rtc_time and ioctls, etc */ +#include <linux/rtc.h> /* For struct rtc_time and ioctls, etc */ #include <linux/bcd.h> #include <asm/mvme16xhw.h>
The MVME16x RTC driver doesn't use any MC146818-specific definitions, hence include the generic <linux/rtc.h> instead of <linux/mc146818rtc.h>. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- To avoid a build failure after "rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h". --- arch/m68k/mvme16x/rtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)