Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7189859f authored by Horst H. von Brand's avatar Horst H. von Brand Committed by David S. Miller
Browse files

[SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI) 



This is bug 8540 on bugzilla.kernel.org

arch/sparc64/time.c contains references to assorted bq4802 stuff if
CONFIG_PCI is not set, and compile fails. I #ifdef'ed out everything
that looks PCI-ish in that file.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22adb358

arch/sparc64/kernel/time.c

+6 −0
Original line number Diff line number Diff line
@@ -1362,6 +1362,7 @@ static int hypervisor_set_rtc_time(struct rtc_time *time) 
	return hypervisor_set_time(seconds);

}



#ifdef CONFIG_PCI

static void bq4802_get_rtc_time(struct rtc_time *time)

{

	unsigned char val = readb(bq4802_regs + 0x0e);
@@ -1433,6 +1434,7 @@ static int bq4802_set_rtc_time(struct rtc_time *time) 


	return 0;

}

#endif /* CONFIG_PCI */



struct mini_rtc_ops {

	void (*get_rtc_time)(struct rtc_time *);
@@ -1449,10 +1451,12 @@ static struct mini_rtc_ops hypervisor_rtc_ops = { 
	.set_rtc_time = hypervisor_set_rtc_time,

};



#ifdef CONFIG_PCI

static struct mini_rtc_ops bq4802_rtc_ops = {

	.get_rtc_time = bq4802_get_rtc_time,

	.set_rtc_time = bq4802_set_rtc_time,

};

#endif /* CONFIG_PCI */



static struct mini_rtc_ops *mini_rtc_ops;
@@ -1576,8 +1580,10 @@ static int __init rtc_mini_init(void) 
		mini_rtc_ops = &hypervisor_rtc_ops;

	else if (this_is_starfire)

		mini_rtc_ops = &starfire_rtc_ops;

#ifdef CONFIG_PCI

	else if (bq4802_regs)

		mini_rtc_ops = &bq4802_rtc_ops;

#endif /* CONFIG_PCI */

	else

		return -ENODEV;