aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Clouter <alex@digriz.org.uk>2009-02-23 22:38:50 +0000
committerNicolas Pitre <nico@cam.org>2009-02-25 00:00:14 -0500
commit673492a800b14a9aac5d9d1af120334b9578a23c (patch)
tree69f07f30a3ade8fe1abe83e63e0079cae8b3ce03
parentf5273fa3102fa4c25819f3034b8834c37d3e62a3 (diff)
[ARM] orion5x: ts78xx amend RTC registering to not depend on ifdef's
amend RTC registering to not depend on ifdef's Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Nicolas Pitre <nico@cam.org>
-rw-r--r--arch/arm/mach-orion5x/ts78xx-setup.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 778b11860ee..640b44db5a3 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -75,7 +75,6 @@ static struct mv_sata_platform_data ts78xx_sata_data = {
/*****************************************************************************
* RTC M48T86 - nicked^Wborrowed from arch/arm/mach-ep93xx/ts72xx.c
****************************************************************************/
-#ifdef CONFIG_RTC_DRV_M48T86
#define TS_RTC_CTRL (TS78XX_FPGA_REGS_VIRT_BASE | 0x808)
#define TS_RTC_DATA (TS78XX_FPGA_REGS_VIRT_BASE | 0x80c)
@@ -150,16 +149,6 @@ static void ts78xx_ts_rtc_unload(void)
{
platform_device_del(&ts78xx_ts_rtc_device);
}
-#else
-static int ts78xx_ts_rtc_load(void)
-{
- return -ENODEV;
-}
-
-static void ts78xx_ts_rtc_unload(void)
-{
-}
-#endif
/*****************************************************************************
* FPGA 'hotplug' support code
@@ -188,8 +177,7 @@ static int ts78xx_fpga_load_devices(void)
if (ts78xx_fpga.supports.ts_rtc.present == 1) {
tmp = ts78xx_ts_rtc_load();
if (tmp) {
- printk(KERN_INFO "TS-78xx RTC"
- " not detected or enabled\n");
+ printk(KERN_INFO "TS-78xx: RTC not registered\n");
ts78xx_fpga.supports.ts_rtc.present = 0;
}
ret |= tmp;