Commit fd0a0ac1 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Linus Torvalds

[PATCH] ep93xx build fix

From: Lennert Buytenhek <buytenh@wantstofly.org>

The recent renaming of m48t86's ->readb() and ->writeb() platform driver
methods (2d7b20c1) to ->readbyte() and
->writebyte() to fix the ia64 build broke the build of the cirrus ep93xx
ARM platform.  This patch fixes it up.
Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a2ef3a50
...@@ -111,21 +111,21 @@ static void __init ts72xx_map_io(void) ...@@ -111,21 +111,21 @@ static void __init ts72xx_map_io(void)
} }
} }
static unsigned char ts72xx_rtc_readb(unsigned long addr) static unsigned char ts72xx_rtc_readbyte(unsigned long addr)
{ {
__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE); __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);
return __raw_readb(TS72XX_RTC_DATA_VIRT_BASE); return __raw_readb(TS72XX_RTC_DATA_VIRT_BASE);
} }
static void ts72xx_rtc_writeb(unsigned char value, unsigned long addr) static void ts72xx_rtc_writebyte(unsigned char value, unsigned long addr)
{ {
__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE); __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);
__raw_writeb(value, TS72XX_RTC_DATA_VIRT_BASE); __raw_writeb(value, TS72XX_RTC_DATA_VIRT_BASE);
} }
static struct m48t86_ops ts72xx_rtc_ops = { static struct m48t86_ops ts72xx_rtc_ops = {
.readb = ts72xx_rtc_readb, .readbyte = ts72xx_rtc_readbyte,
.writeb = ts72xx_rtc_writeb, .writebyte = ts72xx_rtc_writebyte,
}; };
static struct platform_device ts72xx_rtc_device = { static struct platform_device ts72xx_rtc_device = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment