| Message ID | 1366624283-6122-1-git-send-email-linus.walleij@stericsson.com |
|---|---|
| State | Superseded |
| Headers | show
Return-Path: <patchwork-forward+bncBCA6FSNC7EBBBUUQ2SFQKGQEW4Z77VI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B258725DEE for <linaro@patches.linaro.org>; Mon, 22 Apr 2013 09:53:04 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id b4sf2100273qen.6 for <linaro@patches.linaro.org>; Mon, 22 Apr 2013 02:52:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer:mime-version :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=WsosZ7mf/xdQXisGS1L8ggrpFSUOPpm4AHqZn3ZATNs=; b=OeRVxnqFWDOsXDwGoxxIvkbkK9OpJSU9Ktf0OtCUfIeN7wJcuyswCkjfkOFVrZMLyQ 1VIwXucRNqgiP2R374hAYEmwxx8jPJjdumXfNBXJRXmWIP4shGWWsx5bVCJRRe7VnLTU w3yyljSGj2MGJDYX4v/yNVmJdOTh2uX05UZxcbDhNz9U0smgANj4eddmfJ/Mtza89T8p DLQvotdS4UwKQ17OHas/q0az4UBo0mS+tIk47URHGsk79MbwSiMCIXwnIussKA6sKBCS KbapPrjnUUbrD+e0uIVXTNjOux4axCXjuZYFptl8P53TI7anuADI2YrcdL7jhqAZ0ARH vnjw== X-Received: by 10.224.88.200 with SMTP id b8mr19519701qam.8.1366624338470; Mon, 22 Apr 2013 02:52:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.82.83 with SMTP id g19ls3017239qey.51.gmail; Mon, 22 Apr 2013 02:52:18 -0700 (PDT) X-Received: by 10.58.90.66 with SMTP id bu2mr18468165veb.29.1366624338215; Mon, 22 Apr 2013 02:52:18 -0700 (PDT) Received: from mail-vb0-x236.google.com (mail-vb0-x236.google.com [2607:f8b0:400c:c02::236]) by mx.google.com with ESMTPS id ij9si15534153vdb.108.2013.04.22.02.52.17 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Apr 2013 02:52:18 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::236 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::236; Received: by mail-vb0-f54.google.com with SMTP id w16so5678477vbf.27 for <patchwork-forward@linaro.org>; Mon, 22 Apr 2013 02:52:17 -0700 (PDT) X-Received: by 10.220.242.73 with SMTP id lh9mr18238602vcb.49.1366624337861; Mon, 22 Apr 2013 02:52:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp68651veb; Mon, 22 Apr 2013 02:52:17 -0700 (PDT) X-Received: by 10.180.85.103 with SMTP id g7mr64562454wiz.23.1366624336800; Mon, 22 Apr 2013 02:52:16 -0700 (PDT) Received: from eu1sys200aog115.obsmtp.com (eu1sys200aog115.obsmtp.com [207.126.144.139]) by mx.google.com with SMTP id b4si38566297eef.166.2013.04.22.02.52.04 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 02:52:16 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.139; Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob115.postini.com ([207.126.147.11]) with SMTP ID DSNKUXUIQ9AHHRcRrA9PmAebbqqNIx4G5sTz@postini.com; Mon, 22 Apr 2013 09:52:16 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id DC2B215E; Mon, 22 Apr 2013 09:51:27 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id C83904866; Mon, 22 Apr 2013 09:51:21 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 23B29A8074; Mon, 22 Apr 2013 11:51:23 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Mon, 22 Apr 2013 11:51:26 +0200 From: Linus Walleij <linus.walleij@stericsson.com> To: <linux-arm-kernel@lists.infradead.org> Cc: Arnd Bergmann <arnd@arndb.de>, <devicetree-discuss@lists.ozlabs.org>, Linus Walleij <linus.walleij@linaro.org> Subject: [PATCH 01/23] ARM: u300: fix ages old copy/paste bug Date: Mon, 22 Apr 2013 11:51:23 +0200 Message-ID: <1366624283-6122-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkMP6Qaz8cWjo7EXUwhGFMsTFiGTnvRucdZFv9CwzSf9+reYzVGL4i581JDoGJdV6kJw/kx X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::236 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post?hl=en-US>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?hl=en-US&topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/?hl=en-US> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe?hl=en-US>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> Content-Type: text/plain |
diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/include/mach/u300-regs.h index 1e49d90..0320495 100644 --- a/arch/arm/mach-u300/include/mach/u300-regs.h +++ b/arch/arm/mach-u300/include/mach/u300-regs.h @@ -95,7 +95,7 @@ #define U300_SPI_BASE (U300_FAST_PER_PHYS_BASE+0x6000) /* Fast UART1 on U335 only */ -#define U300_UART1_BASE (U300_SLOW_PER_PHYS_BASE+0x7000) +#define U300_UART1_BASE (U300_FAST_PER_PHYS_BASE+0x7000) /* * SLOW peripherals