From patchwork Mon Apr 20 01:45:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Kinard X-Patchwork-Id: 462662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-qk0-x23a.google.com (mail-qk0-x23a.google.com [IPv6:2607:f8b0:400d:c09::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 10B0B140213 for ; Mon, 20 Apr 2015 11:45:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="2048-bit key; unprotected key" header.d=googlegroups.com header.i=@googlegroups.com header.b=lr67Hu9+; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: by qkbw1 with SMTP id w1sf124141306qkb.1 for ; Sun, 19 Apr 2015 18:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:x-original-sender:x-original-authentication-results :reply-to:precedence:mailing-list:list-id:list-post:list-help :list-archive:sender:list-subscribe:list-unsubscribe; bh=nngO38SjnkxtT9G4kQnUicX9ZCDM7EnpI5coqql4kuQ=; b=lr67Hu9+LRPCAMb7phJovbHHKvfXOp0VpQru/XsVRQhYeTtdI78B1S487ZJT0uONnC c1cVtLprQCOcBgXf+j0AZQCXHjlZyA1x05pWydhU0pOGWAkalnUD2ENbV54k6+lZMPYb 40B3fqBpSeYs8zG4zAyq33osnxMxKqS8Gb2uNZMtRhAOapCSs+sRCcrDcTTUvFQYw3ks ruLs8xFJ6wacmOtIoKvRXvonRlMb9aNCYgJCrpEDRcESBYDnpwjJK7WMe9YSR4sz8cuU WaDHc4w5Byi1PuLJz0UWXr+kS726uCCk2JLwP9YhZQW2HnQ61OmMwiNivESpVzOG/PEk iniQ== X-Received: by 10.50.66.142 with SMTP id f14mr243763igt.17.1429494329547; Sun, 19 Apr 2015 18:45:29 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.114.33 with SMTP id jd1ls596767igb.6.gmail; Sun, 19 Apr 2015 18:45:29 -0700 (PDT) X-Received: by 10.66.225.174 with SMTP id rl14mr20079890pac.26.1429494329285; Sun, 19 Apr 2015 18:45:29 -0700 (PDT) Received: from resqmta-ch2-04v.sys.comcast.net (resqmta-ch2-04v.sys.comcast.net. [2001:558:fe21:29:69:252:207:36]) by gmr-mx.google.com with ESMTPS id ks9si458265qcb.3.2015.04.19.18.45.28 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 19 Apr 2015 18:45:29 -0700 (PDT) Received-SPF: neutral (google.com: 2001:558:fe21:29:69:252:207:36 is neither permitted nor denied by domain of kumba@gentoo.org) client-ip=2001:558:fe21:29:69:252:207:36; Received: from resomta-ch2-06v.sys.comcast.net ([69.252.207.102]) by resqmta-ch2-04v.sys.comcast.net with comcast id J1lF1q0022D5gil011lUJk; Mon, 20 Apr 2015 01:45:28 +0000 Received: from [192.168.1.13] ([69.251.155.187]) by resomta-ch2-06v.sys.comcast.net with comcast id J1lS1q00342s2jH011lSAW; Mon, 20 Apr 2015 01:45:28 +0000 Message-ID: <55345A35.5000003@gentoo.org> Date: Sun, 19 Apr 2015 21:45:25 -0400 From: Joshua Kinard User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Andrew Morton , Ralf Baechle , Alessandro Zummo CC: LKML , rtc-linux@googlegroups.com, Linux MIPS List Subject: [rtc-linux] [PATCH]: MIPS: IP32: Fix two build errors in reset code introduced in DS1685 platform hook patch X-Original-Sender: kumba@gentoo.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:558:fe21:29:69:252:207:36 is neither permitted nor denied by domain of kumba@gentoo.org) smtp.mail=kumba@gentoo.org; dkim=pass header.i=@comcast.net Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Joshua Kinard Fix two build errors that somehow got into upstream. Signed-off-by: Joshua Kinard Fixes: 15beb694c661: "mips: ip32: add platform data hooks to use DS1685 driver" --- arch/mips/sgi-ip32/ip32-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c index 0134db2..686a372 100644 --- a/arch/mips/sgi-ip32/ip32-platform.c +++ b/arch/mips/sgi-ip32/ip32-platform.c @@ -130,9 +130,9 @@ struct platform_device ip32_rtc_device = { .resource = ip32_rtc_resources, }; -+static int __init sgio2_rtc_devinit(void) +static int __init sgio2_rtc_devinit(void) { return platform_device_register(&ip32_rtc_device); } -device_initcall(sgio2_cmos_devinit); +device_initcall(sgio2_rtc_devinit);