Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.

Browse source 
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Randy Dunlap 2006-07-05 20:18:39 -07:00 committed by David S. Miller
parent e340221acd
commit 7233589d77
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc64/kernel/prom.c
View file

@ -1032,7 +1032,9 @@ static void sun4v_vdev_irq_trans_init(struct device_node *dp)
static void irq_trans_init(struct device_node *dp) static void irq_trans_init(struct device_node *dp)
{ {
const char *model; const char *model;
#ifdef CONFIG_PCI
int i; int i;
#endif
model = of_get_property(dp, "model", NULL); model = of_get_property(dp, "model", NULL);
if (!model) if (!model)

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

@ -788,12 +788,15 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
if (!regs) if (!regs)
return -ENOMEM; return -ENOMEM;
#ifdef CONFIG_PCI
if (!strcmp(model, "ds1287") || if (!strcmp(model, "ds1287") ||
!strcmp(model, "m5819") || !strcmp(model, "m5819") ||
!strcmp(model, "m5819p") || !strcmp(model, "m5819p") ||
!strcmp(model, "m5823")) { !strcmp(model, "m5823")) {
ds1287_regs = (unsigned long) regs; ds1287_regs = (unsigned long) regs;
} else if (model[5] == '0' && model[6] == '2') { } else
#endif
if (model[5] == '0' && model[6] == '2') {
mstk48t02_regs = regs; mstk48t02_regs = regs;
} else if(model[5] == '0' && model[6] == '8') { } else if(model[5] == '0' && model[6] == '8') {
mstk48t08_regs = regs; mstk48t08_regs = regs;

14
include/asm-sparc64/dma-mapping.h
View file

@ -160,6 +160,20 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
BUG(); BUG();
} }
static inline void
dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction)
{
BUG();
}
static inline void
dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction)
{
BUG();
}
#endif /* PCI */ #endif /* PCI */