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

Commit 7233589d authored by Randy Dunlap's avatar Randy Dunlap Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e340221a

arch/sparc64/kernel/prom.c

+2 −0
Original line number Diff line number Diff line
@@ -1032,7 +1032,9 @@ static void sun4v_vdev_irq_trans_init(struct device_node *dp) 
static void irq_trans_init(struct device_node *dp)

{

	const char *model;

#ifdef CONFIG_PCI

	int i;

#endif



	model = of_get_property(dp, "model", NULL);

	if (!model)

arch/sparc64/kernel/time.c

+4 −1
Original line number Diff line number Diff line
@@ -788,12 +788,15 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id 
	if (!regs)

		return -ENOMEM;



#ifdef CONFIG_PCI

	if (!strcmp(model, "ds1287") ||

	    !strcmp(model, "m5819") ||

	    !strcmp(model, "m5819p") ||

	    !strcmp(model, "m5823")) {

		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;

	} else if(model[5] == '0' && model[6] == '8') {

		mstk48t08_regs = regs;

include/asm-sparc64/dma-mapping.h

+14 −0
Original line number Diff line number Diff line
@@ -160,6 +160,20 @@ static inline void dma_free_coherent(struct device *dev, size_t size, 
	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 */