Message ID | 1462178783-29294-2-git-send-email-geert@linux-m68k.org |
---|---|
State | Accepted |
Headers | show
Return-Path: <rtc-linux+bncBCQJP74GSUDRBAFMTS4QKGQEPVR3SAA@googlegroups.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-lf0-x23a.google.com (mail-lf0-x23a.google.com [IPv6:2a00:1450:4010:c07::23a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qyynH1cYzz9t5V for <incoming@patchwork.ozlabs.org>; Mon, 2 May 2016 18:55:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b=Bf8LQWNw; dkim-atps=neutral Received: by mail-lf0-x23a.google.com with SMTP id u64sf18135814lff.1 for <incoming@patchwork.ozlabs.org>; Mon, 02 May 2016 01:55:31 -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=MwwKJCTVdcxa1ACla+jodwmaLrGokfVm9UlaHLLrZxE=; b=Bf8LQWNwGdDk8zvvL7J6afcePhyNqayOT8mpL9CxsN0yzmTeK0Cde5R26UhplkFVuI bf/lm8gdP13aWPJcJFj0M73phzaRjGk1UJA2w6+JryvTKIZeaF8jGQ/+E4a492gUToP0 RjA5i1426XrK98sphWGSxpW0RZVKY+9ZAnB7rlPKkN/8SpeJlIMJkCfeJJhaFksU8+Oy Maao4aNIwWhtuuPh693hZNmngm3gm1ZHvUseertL2vhgkH8ftG6MTeVts8f0ZI9EnyWC 2CFGmFckedhmKgmo5jzywa93C2VJqCr/69/Qmz7ZLiANATvxjCkI2+r+iaqstWEAsFQg oH1Q== 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=MwwKJCTVdcxa1ACla+jodwmaLrGokfVm9UlaHLLrZxE=; b=il2R2KyVS1kJgo/pxKcS9VNSVwWAWywkxDP4QtWB/IwratSuTur8SuvZ1dkyc5lVGj t2Jw4pGhQGurhVfBRhap2FY1alIn93MZh95iltIncoohiRnfZszHbOSrOepTRvlbwDYp EuEd3DS8jQTf6o7UM5Vqhtr6RLpVn2xbjF879a+y5pb2VQKv4UEhzb7fw1+FkE2htE7U s2eggcdFDoHiDPlpam5bbVfyHcak0wEBinhhKgy0KwyeYn0PDQOUrrrlFPQ2YSyHRepf UTpCfjF6Tv0lI1IXqQHUF5mTbH5zsQBvbFC+O4NvVnCqnyPXFOCsFyDDxY7PNO0dcx+a ad0w== Sender: rtc-linux@googlegroups.com X-Gm-Message-State: AOPr4FWF83UCAwF3mOzggsic/4hnIXJ+LF0t2RmUS0QCk6v/7b27vBhTdav3/4Q5ETCu/g== X-Received: by 10.28.178.139 with SMTP id b133mr64761wmf.16.1462179328127; Mon, 02 May 2016 01:55:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.28.19.81 with SMTP id 78ls344286wmt.24.gmail; Mon, 02 May 2016 01:55:27 -0700 (PDT) X-Received: by 10.28.152.207 with SMTP id a198mr1607222wme.4.1462179327838; Mon, 02 May 2016 01:55:27 -0700 (PDT) Received: from michel.telenet-ops.be (michel.telenet-ops.be. [2a02:1800:110:4::f00:18]) by gmr-mx.google.com with ESMTPS id a124si764277wme.0.2016.05.02.01.55.26 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:110:4::f00:18 is neither permitted nor denied by best guess record for domain of geert@linux-m68k.org) client-ip=2a02:1800:110:4::f00:18; Received: from ayla.of.borg ([84.195.107.21]) by michel.telenet-ops.be with bizsmtp id pLmf1s00o0TjorY06Lmfgs; Mon, 02 May 2016 10:47:54 +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-0002IY-RW; 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-0007dC-Qf; 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 1/2] m68k/bvme6000: Include generic <linux/rtc.h> Date: Mon, 2 May 2016 10:46:22 +0200 Message-Id: <1462178783-29294-2-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:110:4::f00:18 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/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c index cf12a17dc289c5f9..f7984f44ff0f8072 100644 --- a/arch/m68k/bvme6000/rtc.c +++ b/arch/m68k/bvme6000/rtc.c @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/poll.h> #include <linux/module.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/bvme6000hw.h>
The BVME6000 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/bvme6000/rtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)