From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] ARM: PXA: fix gpio-pxa.h build errors
Date: Sat, 05 Nov 2011 22:29:34 +0000 [thread overview]
Message-ID: <E1RMok2-0000KQ-9j@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20111105222832.GH12913@n2100.arm.linux.org.uk>
A mismerge in 43872fa (Merge branch 'depends/rmk/gpio' into next/fixes)
causes these build errors:
In file included from arch/arm/mach-pxa/include/mach/gpio.h:30,
from arch/arm/include/asm/gpio.h:6,
from include/linux/gpio.h:31,
from arch/arm/mach-pxa/generic.c:20:
arch/arm/mach-pxa/include/mach/gpio-pxa.h: In function ?__gpio_is_occupied?:
arch/arm/mach-pxa/include/mach/gpio-pxa.h:121: error: invalid operands to binary >> (have ?void *? and ?unsigned int?)
arch/arm/mach-pxa/include/mach/gpio-pxa.h:122: error: invalid operands to binary & (have ?void *? and ?int?)
arch/arm/mach-pxa/include/mach/gpio-pxa.h:129: error: invalid operands to binary & (have ?void *? and ?int?)
So fix them.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
arch/arm/mach-pxa/include/mach/gpio-pxa.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-pxa/include/mach/gpio-pxa.h b/arch/arm/mach-pxa/include/mach/gpio-pxa.h
index 576868f..41b4c93 100644
--- a/arch/arm/mach-pxa/include/mach/gpio-pxa.h
+++ b/arch/arm/mach-pxa/include/mach/gpio-pxa.h
@@ -25,7 +25,7 @@
#define GPIO_REGS_VIRT io_p2v(0x40E00000)
#define BANK_OFF(n) (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
-#define GPIO_REG(x) (GPIO_REGS_VIRT + (x))
+#define GPIO_REG(x) (*(volatile u32 *)(GPIO_REGS_VIRT + (x)))
/* GPIO Pin Level Registers */
#define GPLR0 GPIO_REG(BANK_OFF(0) + 0x00)
--
1.7.4.4
next prev parent reply other threads:[~2011-11-05 22:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-04 11:30 [PATCH 0/2] Minor PXA fixes Russell King - ARM Linux
2011-11-04 11:30 ` [PATCH 1/2] ARM: PXA: fix lubbock PCMCIA driver build error Russell King - ARM Linux
2011-11-04 11:31 ` [PATCH 2/2] ARM: PXA: eseries: fix eseries_register_clks section mismatch warning Russell King - ARM Linux
[not found] ` <CAMPhdO-t0mJb2U+1eutKA4YRwCXsr2smLNKDw_a7T+TJXLbmvQ@mail.gmail.com>
2011-11-05 22:28 ` [PATCH 0/2] Minor PXA fixes Russell King - ARM Linux
2011-11-05 22:29 ` Russell King - ARM Linux [this message]
2011-11-05 22:29 ` [PATCH 2/2] ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1RMok2-0000KQ-9j@rmk-PC.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).