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

Commit b84ca92e authored by Andreas Larsson's avatar Andreas Larsson Committed by David S. Miller
Browse files

sparc32, leon: Make leon_dma_ops avaiable when !CONFIG_PCI 



The leon_dma_ops struct is needed for leon regardless of PCI configuration.

Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 384859d2

arch/sparc/include/asm/dma-mapping.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -20,10 +20,12 @@ extern struct bus_type pci_bus_type; 




static inline struct dma_map_ops *get_dma_ops(struct device *dev)

static inline struct dma_map_ops *get_dma_ops(struct device *dev)

{

{

#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)

#ifdef CONFIG_SPARC_LEON

	if (sparc_cpu_model == sparc_leon)

	if (sparc_cpu_model == sparc_leon)

		return leon_dma_ops;

		return leon_dma_ops;

	else if (dev->bus == &pci_bus_type)

#endif

#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)

	if (dev->bus == &pci_bus_type)

		return &pci32_dma_ops;

		return &pci32_dma_ops;

#endif

#endif

	return dma_ops;

	return dma_ops;