evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: David S. Miller <davem@davemloft.net>
This commit is contained in:
Horst H. von Brand 2007-05-26 17:47:53 -07:00 • committed by David S. Miller
parent 22adb358e8
commit 7189859f28
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/sparc64/kernel/time.c
View file

@ -1362,6 +1362,7 @@ static int hypervisor_set_rtc_time(struct rtc_time *time)
return hypervisor_set_time(seconds); return hypervisor_set_time(seconds);
} }
#ifdef CONFIG_PCI
static void bq4802_get_rtc_time(struct rtc_time *time) static void bq4802_get_rtc_time(struct rtc_time *time)
{ {
unsigned char val = readb(bq4802_regs + 0x0e); unsigned char val = readb(bq4802_regs + 0x0e);
@ -1433,6 +1434,7 @@ static int bq4802_set_rtc_time(struct rtc_time *time)
return 0; return 0;
} }
#endif /* CONFIG_PCI */
struct mini_rtc_ops { struct mini_rtc_ops {
void (*get_rtc_time)(struct rtc_time *); 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, .set_rtc_time = hypervisor_set_rtc_time,
}; };
#ifdef CONFIG_PCI
static struct mini_rtc_ops bq4802_rtc_ops = { static struct mini_rtc_ops bq4802_rtc_ops = {
.get_rtc_time = bq4802_get_rtc_time, .get_rtc_time = bq4802_get_rtc_time,
.set_rtc_time = bq4802_set_rtc_time, .set_rtc_time = bq4802_set_rtc_time,
}; };
#endif /* CONFIG_PCI */
static struct mini_rtc_ops *mini_rtc_ops; 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; mini_rtc_ops = &hypervisor_rtc_ops;
else if (this_is_starfire) else if (this_is_starfire)
mini_rtc_ops = &starfire_rtc_ops; mini_rtc_ops = &starfire_rtc_ops;
#ifdef CONFIG_PCI
else if (bq4802_regs) else if (bq4802_regs)
mini_rtc_ops = &bq4802_rtc_ops; mini_rtc_ops = &bq4802_rtc_ops;
#endif /* CONFIG_PCI */
else else
return -ENODEV; return -ENODEV;